summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-08-02 16:28:58 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-08-02 16:28:58 (GMT)
commit85e14302e0344f00f56d2bed046bb19e03a92fba (patch)
treef870edb6c6ba67590427385c695cb920f6a5f83f /src
parentbf6e4b8ccf3743a230ce0828ce4a57724cf99971 (diff)
downloadpowder-85e14302e0344f00f56d2bed046bb19e03a92fba.zip
powder-85e14302e0344f00f56d2bed046bb19e03a92fba.tar.gz
Keep zoom window open when undoing
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 2f17855..2816037 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2128,7 +2128,7 @@ int main(int argc, char *argv[])
if (!sdl_zoom_trig && zoom_en==1)
zoom_en = 0;
- if (sdl_key=='z' && zoom_en==2 && sys_shortcuts==1)
+ if (sdl_key=='z' && !(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)) && zoom_en==2 && sys_shortcuts==1)
zoom_en = 1;
if (load_mode)