Fix thread management also in Windows

amadvance · Feb 6, 2024 · 7b1de3d · 7b1de3d
1 parent 3f25b4c
commit 7b1de3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/advance/osd/video.c b/advance/osd/video.c
@@ -885,7 +885,8 @@ static adv_error vidmode_update(struct advance_video_context* context, adv_mode*
 
 void advance_thread_vidmode_done(struct advance_video_context* context, adv_bool restore)
 {
-#ifdef USE_SMP
+	/* in Windows using the thread makes the keyboard not working */
+#if defined(USE_SMP) && defined(__linux__)
 	context->state.thread_arg_bool = restore;
 
 	advance_video_thread_signal(context, THREAD_DONE);
@@ -898,7 +899,8 @@ void advance_thread_vidmode_done(struct advance_video_context* context, adv_bool
 
 adv_error advance_thread_vidmode_update(struct advance_video_context* context, adv_mode* mode, adv_bool ignore_input)
 {
-#ifdef USE_SMP
+	/* in Windows using the thread makes the keyboard not working */
+#if defined(USE_SMP) && defined(__linux__)
 	context->state.thread_arg_mode = mode;
 	context->state.thread_arg_bool = ignore_input;
 

diff --git a/advance/sdl/vsdl.c b/advance/sdl/vsdl.c
@@ -1266,6 +1266,7 @@ adv_error sdl_scroll(unsigned offset, adv_bool waitvsync)
 #endif
 	) {
 		log_std(("video:sdl: recompute renderer for thread/vsync change\n"));
+		sdl_state.overlay_vsync = waitvsync;
 		sdl_overlay_set();
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1266,6 +1266,7 @@ adv_error sdl_scroll(unsigned offset, adv_bool waitvsync) @@
     #endif
     	) {
     		log_std(("video:sdl: recompute renderer for thread/vsync change\n"));
+    		sdl_state.overlay_vsync = waitvsync;
     		sdl_overlay_set();
     	}
@@ Expand Down @@