From 61b5194ccddf9d76ac91bd3b9c1d793ef5c9e444 Mon Sep 17 00:00:00 2001 From: "avihal@gmail.com" Date: Sun, 9 Jan 2011 00:12:38 +0000 Subject: [PATCH] Presets GUI consistency fix: Speedhacks 'Restore Defaults' resulted in grayed-out controls if last applied settings include presets enabled. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4184 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/Panels/SpeedhacksPanel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp index 4388b67932..7fde63d91c 100644 --- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp +++ b/pcsx2/gui/Panels/SpeedhacksPanel.cpp @@ -360,8 +360,10 @@ void Panels::SpeedHacksPanel::OnEnable_Toggled( wxCommandEvent& evt ) void Panels::SpeedHacksPanel::Defaults_Click( wxCommandEvent& evt ) { + //Can only get here presets are disabled at the GUI (= the 'Defaults' button is enabled). AppConfig currentConfigWithHacksReset = *g_Conf; currentConfigWithHacksReset.EmuOptions.Speedhacks = Pcsx2Config::SpeedhackOptions(); + currentConfigWithHacksReset.EnablePresets=false;//speed hacks gui depends on preset, apply it as if presets are disabled ApplyConfigToGui( currentConfigWithHacksReset ); evt.Skip(); }