From: Toni Wilen <twilen@winuae.net>
Date: Tue, 15 May 2018 17:22:09 +0000 (+0300)
Subject: Fix mouse capture in full window mode.
X-Git-Tag: 4000~55
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=52c21118b99ecd4c136b27e0033734e3db509b4a;p=francis%2Fwinuae.git

Fix mouse capture in full window mode.
---

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index eb0ba3c5..f814c218 100644
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -1115,7 +1115,7 @@ static void winuae_active(struct AmigaMonitor *mon, HWND hwnd, int minimized)
 	getcapslock ();
 	wait_keyrelease ();
 	inputdevice_acquire (TRUE);
-	if (isfullscreen () != 0 && !gui_active)
+	if (isfullscreen () > 0 && !gui_active)
 		setmouseactive(mon->monitor_id, 1);
 #ifdef LOGITECHLCD
 	if (!minimized)
@@ -2432,6 +2432,8 @@ static int canstretch(struct AmigaMonitor *mon)
 	if (isfullscreen () != 0)
 		return 0;
 	if (!WIN32GFX_IsPicassoScreen(mon)) {
+		if (!currprefs.gfx_windowed_resize)
+			return 0;
 		if (currprefs.gf[APMODE_NATIVE].gfx_filter_autoscale == AUTOSCALE_RESIZE)
 			return 0;
 		return 1;