Skip to content

Commit 1951594

Browse files
committed
Always show actual vsync setting in the interface instead of desired setting.
1 parent d71934c commit 1951594

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/frontend.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -944,17 +944,16 @@ bool runVideoOptionsMenu(void)
944944
case FRONTEND_VSYNC:
945945
case FRONTEND_VSYNC_R:
946946
{
947+
WzMainWindow::instance()->setSwapInterval(!war_GetVsync());
948+
war_SetVsync(WzMainWindow::instance()->swapInterval() > 0);
947949
if (war_GetVsync())
948950
{
949-
war_SetVsync(false);
950951
widgSetString(psWScreen, FRONTEND_VSYNC_R, _("Off"));
951952
}
952953
else
953954
{
954-
war_SetVsync(true);
955955
widgSetString(psWScreen, FRONTEND_VSYNC_R, _("On"));
956956
}
957-
WzMainWindow::instance()->setSwapInterval(war_GetVsync());
958957
break;
959958
}
960959

src/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1294,11 +1294,12 @@ int main(int argc, char *argv[])
12941294
else
12951295
{
12961296
mainwindow.show();
1297-
mainwindow.setMinimumSize(w, h);
1297+
mainwindow.setMinimumSize(w, h);
12981298
mainwindow.setMaximumSize(w, h);
12991299
}
13001300

13011301
mainwindow.setSwapInterval(war_GetVsync());
1302+
war_SetVsync(mainwindow.swapInterval() > 0);
13021303

13031304
mainwindow.setReadyToPaint();
13041305

0 commit comments

Comments
 (0)