From cf0b4c9387bb613b20d170e5e034776653a87ce5 Mon Sep 17 00:00:00 2001 From: EmptyChaos Date: Sat, 23 Jul 2016 01:05:22 +0000 Subject: ISOProperties: Add notification when Cheats are disabled. If the user enables a cheat while cheats are globally disabled then display a notice about it. Issue 9690. --- Source/Core/DolphinWX/FrameTools.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'Source/Core/DolphinWX/FrameTools.cpp') diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 4dc8789796..2fdf38a02f 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -600,6 +600,20 @@ void CFrame::InitBitmaps() RecreateToolbar(); } +void CFrame::OpenGeneralConfiguration(int tab) +{ + CConfigMain config_main(this); + if (tab > -1) + config_main.SetSelectedTab(tab); + + HotkeyManagerEmu::Enable(false); + if (config_main.ShowModal() == wxID_OK) + m_GameListCtrl->Update(); + HotkeyManagerEmu::Enable(true); + + UpdateGUI(); +} + // Menu items // Start the game or change the disc. @@ -1300,12 +1314,7 @@ void CFrame::OnReset(wxCommandEvent& WXUNUSED(event)) void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED(event)) { - CConfigMain ConfigMain(this); - HotkeyManagerEmu::Enable(false); - if (ConfigMain.ShowModal() == wxID_OK) - m_GameListCtrl->Update(); - HotkeyManagerEmu::Enable(true); - UpdateGUI(); + OpenGeneralConfiguration(); } void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED(event)) @@ -1318,12 +1327,7 @@ void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED(event)) void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED(event)) { - CConfigMain ConfigMain(this); - ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE); - HotkeyManagerEmu::Enable(false); - if (ConfigMain.ShowModal() == wxID_OK) - m_GameListCtrl->Update(); - HotkeyManagerEmu::Enable(true); + OpenGeneralConfiguration(CConfigMain::ID_AUDIOPAGE); } void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED(event)) -- cgit v1.2.3