From 116d238d2e4f7d93ff85019264665f37e5103316 Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 26 Jul 2013 19:06:29 -0400 Subject: [PATCH 1/2] Win32 UI: Remove secondary loop for unchecking/checking Window Zoom options. It was not needed, and caused a bug.. --- Windows/WndMainWindow.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index a6aa1d02f1..0ef2f916e4 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1210,7 +1210,7 @@ namespace MainWindow ID_OPTIONS_SCREEN4X, }; for (int i = 0; i < 4; i++) { - CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iWindowZoom - 1) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iWindowZoom-1) ? MF_CHECKED : MF_UNCHECKED)); } static const int texscalingitems[] = { @@ -1270,16 +1270,6 @@ namespace MainWindow CheckMenuItem(menu, frameskipping[i], MF_BYCOMMAND | ( i == g_Config.iFrameSkip )? MF_CHECKED : MF_UNCHECKED); } - static const int zoommode[] = { - ID_OPTIONS_SCREEN1X, - ID_OPTIONS_SCREEN2X, - ID_OPTIONS_SCREEN3X, - ID_OPTIONS_SCREEN4X, - }; - for (int i = 0; i < 4; i++) { - CheckMenuItem(menu, zoommode[i], MF_BYCOMMAND | ( i == g_Config.iWindowZoom )? MF_CHECKED : MF_UNCHECKED); - } - UpdateCommands(); } From 738338f8beddb7115ddb9112c3a6379f54ff792d Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 26 Jul 2013 19:08:24 -0400 Subject: [PATCH 2/2] Fix typo. --- Windows/WndMainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 0ef2f916e4..040f6b7425 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1210,7 +1210,7 @@ namespace MainWindow ID_OPTIONS_SCREEN4X, }; for (int i = 0; i < 4; i++) { - CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iWindowZoom-1) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iWindowZoom - 1) ? MF_CHECKED : MF_UNCHECKED)); } static const int texscalingitems[] = {