Sumudu Fernando points out that in the big r9214 destabilisation I

mistakenly rearranged the logic in an if statement in window.c, with
the effect that scroll-wheel events are no longer sent via xterm mouse
tracking. Put it back to the way it was.

[originally from svn r9679]
[r9214 == a1f3b7a358adaa7c2a98359cd0373aa823eeb14b]

windows/window.c

@@ -3221,8 +3221,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		} else
 		    break;
 
-		if (send_raw_mouse && shift_pressed &&
-		    !(conf_get_int(conf, CONF_mouse_override))) {
+		if (send_raw_mouse &&
+		    !(conf_get_int(conf, CONF_mouse_override) &&
+                      shift_pressed)) {
 		    /* Mouse wheel position is in screen coordinates for
 		     * some reason */
 		    POINT p;