fixed setting setup value and list selection for vsync mode

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 01b8031bf94a452bfb95135a732dab3d5236609d..a5d9d45fd62053da4df73f4d68912e6add29bdff 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -3768,7 +3768,7 @@ static void DrawInfoScreen_Version(void)
     getStringCopyNStatic(SDLGetRendererName(), driver_name_len);
 
   DrawTextF(xstart1, ystart, font_text, "Render Driver");
-  DrawTextF(xstart2, ystart, font_text, "%s", ARG_DEFAULT);
+  DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_renderdriver);
   DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
   ystart += ystep_line;
 
@@ -5302,13 +5302,21 @@ static void execSetupGraphics(void)
   if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
     execSetupGraphics_setWindowSizes(FALSE);
 
+  // update "setup.vsync_mode" from list selection
+  // (in this case, vsync mode was changed on setup screen)
+  if (setup_mode == SETUP_MODE_CHOOSE_VSYNC)
+    execSetupGraphics_setVsyncModes(FALSE);
+
   // update list selection from "setup.window_scaling_percent"
   // (window scaling may have changed by resizing the window)
   execSetupGraphics_setWindowSizes(TRUE);
 
+  // update list selection from "setup.vsync_mode"
+  // (vsync_mode may have changed by re-creating the renderer)
+  execSetupGraphics_setVsyncModes(TRUE);
+
   execSetupGraphics_setScalingTypes();
   execSetupGraphics_setRenderingModes();
-  execSetupGraphics_setVsyncModes(FALSE);
 
   setup_mode = SETUP_MODE_GRAPHICS;
 
@@ -5329,7 +5337,7 @@ static void execSetupGraphics(void)
   SDLSetScreenRenderingMode(setup.screen_rendering_mode);
 
   // screen vsync mode may have changed at this point
-  SDLSetScreenVsyncMode(setup.vsync_mode);
+  ChangeVsyncModeIfNeeded();
 }
 
 static void execSetupChooseWindowSize(void)