Patch from RDB: the xterm move-window sequences now don't screw up

[PuTTY.git] / window.c

diff --git a/window.c b/window.c
index 59901010e07eb2210b6523b4ae3fad8e988be83a..1b7f60891e8bc21aa62dc1db8ec8a309fb0a247a 100644 (file)
--- a/window.c
+++ b/window.c
@@ -11,10 +11,12 @@
 #endif
 #endif
 
+#ifndef NO_MULTIMON
 #if WINVER < 0x0500
 #define COMPILE_MULTIMON_STUBS
 #include <multimon.h>
 #endif
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -4220,6 +4222,11 @@ void set_iconic(int iconic)
  */
 void move_window(int x, int y)
 {
+    if (cfg.resize_action == RESIZE_DISABLED || 
+        cfg.resize_action == RESIZE_FONT ||
+       IsZoomed(hwnd))
+       return;
+
     SetWindowPos(hwnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
 }