From 3a3ee9131e24b7910cfd4eced51bd57265de818f Mon Sep 17 00:00:00 2001 From: John Peterson Date: Tue, 9 Jun 2009 13:01:50 +0000 Subject: [PATCH] OpenGL: GUI fix for 1x and 2x git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3389 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index f5d84c587e..cd173bd3ed 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -485,11 +485,13 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event) break; case ID_NATIVERESOLUTION: g_Config.bNativeResolution = m_NativeResolution->IsChecked(); - if (g_Config.bNativeResolution) g_Config.b2xResolution = false; + // Don't allow 1x and 2x at the same time + if (g_Config.bNativeResolution) { g_Config.b2xResolution = false; m_2xResolution->SetValue(false); } break; case ID_2X_RESOLUTION: g_Config.b2xResolution = m_2xResolution->IsChecked(); - if (g_Config.b2xResolution) g_Config.bNativeResolution = false; + // Don't allow 1x and 2x at the same time + if (g_Config.b2xResolution) { g_Config.bNativeResolution = false; m_NativeResolution->SetValue(false); } break; case ID_VSYNC: g_Config.bVSync = m_VSync->IsChecked();