Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

src/win/win.c

@@ -495,6 +495,9 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
 	return(1);
     }
 
+    extern int gfxcard_2;
+    gfxcard_2 = 0;
+
     /* Create console window. */
     if (force_debug) {
 	CreateConsole(1);
@@ -552,11 +555,12 @@ main_thread(void *param)
 		Sleep(1);
 
 	/* If needed, handle a screen resize. */
-	if (!atomic_flag_test_and_set(&doresize) && !video_fullscreen && !is_quit) {
+	if (atomic_load(&doresize_monitors[0]) && !video_fullscreen && !is_quit) {
 		if (vid_resize & 2)
 			plat_resize(fixed_size_x, fixed_size_y);
 		else
 			plat_resize(scrnsz_x, scrnsz_y);
+		atomic_store(&doresize_monitors[0], 0);
 	}
     }
 
@@ -1173,7 +1177,7 @@ plat_setfullscreen(int on)
     video_fullscreen &= 1;
     video_force_resize_set(1);
     if (!(on & 1))
-        atomic_flag_clear(&doresize);
+        atomic_store(&doresize_monitors[0], 1);
 
     win_mouse_init();
 
@@ -1251,7 +1255,7 @@ void
 take_screenshot(void)
 {
     startblit();
-    screenshots++;
+    monitors[0].mon_screenshots++;
     endblit();
     device_force_redraw();
 }