From c7783fe01582ee88257b4432bb7d9ec26337863b Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sun, 6 Feb 2011 15:15:00 +0000 Subject: [PATCH] Oops, remember to save plugin settings in both close cases. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7093 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp | 5 ++--- .../Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp b/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp index a5427df995..7462225421 100644 --- a/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp +++ b/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp @@ -50,19 +50,18 @@ void SettingChoice::UpdateValue(wxCommandEvent& ev) void VideoConfigDiag::Event_ClickClose(wxCommandEvent&) { - EndModal(wxID_OK); + Close(); } void VideoConfigDiag::Event_Close(wxCloseEvent& ev) { g_Config.Save((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str()); - ev.Skip(); + EndModal(wxID_OK); TextureCache::Invalidate(false); // For settings like hi-res textures/texture format/etc. } - // TODO: implement some hack to increase the tooltip display duration, because some of these are way too long for anyone to read in 5 seconds. wxString adapter_tooltip = wxTRANSLATE("Select a hardware adapter to use.\nWhen in doubt, use the first one"); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp index 6bdea7c288..e3add43529 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp @@ -132,12 +132,12 @@ VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title, void VideoConfigDialog::Event_ClickClose(wxCommandEvent&) { - EndModal(wxID_OK); + Close(); } void VideoConfigDialog::Event_Close(wxCloseEvent& ev) { g_SWVideoConfig.Save((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str()); - ev.Skip(); + EndModal(wxID_OK); }