ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2770 from Armada651/modal-hotkeys 

FrameTools: Disable hotkeys while a modal dialog is shown.
This commit is contained in:
Jules Blok 2015-07-25 13:02:13 +02:00
parent fbd5bb815c 8eee13e7af
commit dfe5ed54a4
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -1154,7 +1154,9 @@ void CFrame::DoStop()
wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION, wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION,
wxDefaultPosition); wxDefaultPosition);
HotkeyManagerEmu::Enable(false);
int Ret = m_StopDlg.ShowModal(); int Ret = m_StopDlg.ShowModal();
HotkeyManagerEmu::Enable(true);
if (Ret != wxID_YES) if (Ret != wxID_YES)
{ {
Core::SetState(state); Core::SetState(state);
@ -1298,29 +1300,37 @@ void CFrame::OnReset(wxCommandEvent& WXUNUSED (event))
void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event))
{ {
CConfigMain ConfigMain(this); CConfigMain ConfigMain(this);
HotkeyManagerEmu::Enable(false);
if (ConfigMain.ShowModal() == wxID_OK) if (ConfigMain.ShowModal() == wxID_OK)
m_GameListCtrl->Update(); m_GameListCtrl->Update();
HotkeyManagerEmu::Enable(true);
UpdateGUI(); UpdateGUI();
} }
void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event))
{ {
HotkeyManagerEmu::Enable(false);
if (g_video_backend) if (g_video_backend)
g_video_backend->ShowConfig(this); g_video_backend->ShowConfig(this);
HotkeyManagerEmu::Enable(true);
} }
void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED (event))
{ {
CConfigMain ConfigMain(this); CConfigMain ConfigMain(this);
ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE); ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE);
HotkeyManagerEmu::Enable(false);
if (ConfigMain.ShowModal() == wxID_OK) if (ConfigMain.ShowModal() == wxID_OK)
m_GameListCtrl->Update(); m_GameListCtrl->Update();
HotkeyManagerEmu::Enable(true);
} }
void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED (event))
{ {
ControllerConfigDiag config_dlg(this); ControllerConfigDiag config_dlg(this);
HotkeyManagerEmu::Enable(false);
config_dlg.ShowModal(); config_dlg.ShowModal();
HotkeyManagerEmu::Enable(true);
} }
void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event))
@ -1365,7 +1375,9 @@ void CFrame::OnHelp(wxCommandEvent& event)
case wxID_ABOUT: case wxID_ABOUT:
{ {
AboutDolphin frame(this); AboutDolphin frame(this);
HotkeyManagerEmu::Enable(false);
frame.ShowModal(); frame.ShowModal();
HotkeyManagerEmu::Enable(true);
} }
break; break;
case IDM_HELP_WEBSITE: case IDM_HELP_WEBSITE:
@ -1425,7 +1437,9 @@ void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event)) void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
{ {
CMemcardManager MemcardManager(this); CMemcardManager MemcardManager(this);
HotkeyManagerEmu::Enable(false);
MemcardManager.ShowModal(); MemcardManager.ShowModal();
HotkeyManagerEmu::Enable(true);
} }
void CFrame::OnExportAllSaves(wxCommandEvent& WXUNUSED (event)) void CFrame::OnExportAllSaves(wxCommandEvent& WXUNUSED (event))