From: Toni Wilen <twilen@winuae.net>
Date: Sat, 21 Oct 2023 15:44:39 +0000 (+0300)
Subject: Different monitor check fixed (default monitor can be same as monitor with id>0)
X-Git-Tag: 5.1.0~75
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=18a56f17cb2e65ac3ae9437afcc52c0c4c850105;p=francis%2Fwinuae.git

Different monitor check fixed (default monitor can be same as monitor with id>0)
---

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index dd9177e4..5dcc1a79 100644
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -3010,11 +3010,12 @@ void gfx_set_picasso_state(int monid, int on)
 		if (_tcscmp(newf->gfx_filtermask[i], oldf->gfx_filtermask[i]))
 			mode = -1;
 	}
+	bool differentmonitor = getdisplay(&currprefs, newmode->gfx_display) != getdisplay(&currprefs, oldmode->gfx_display);
 	// if screen parameter changes, need to reopen window
 	if (newmode->gfx_fullscreen != oldmode->gfx_fullscreen ||
 		(newmode->gfx_fullscreen && (
 			newmode->gfx_backbuffers != oldmode->gfx_backbuffers ||
-			newmode->gfx_display != oldmode->gfx_display ||
+			differentmonitor ||
 			newmode->gfx_refreshrate != oldmode->gfx_refreshrate ||
 			newmode->gfx_strobo != oldmode->gfx_strobo ||
 			newmode->gfx_vflip != oldmode->gfx_vflip ||