mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-02 14:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the save state hotkeys so that they work with the Render to Main Window option.

Browse source
This commit is contained in:
skidau 2015-02-04 23:23:52 +11:00
commit cc6b55ee2a
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/DolphinWX/Frame.cpp
View file

@ -1398,8 +1398,6 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
} }
unsigned int i = NUM_HOTKEYS; unsigned int i = NUM_HOTKEYS;
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || TASInputHasFocus())
{
for (i = 0; i < NUM_HOTKEYS; i++) for (i = 0; i < NUM_HOTKEYS; i++)
{ {
if (IsHotkey(event, i)) if (IsHotkey(event, i))
@ -1419,7 +1417,6 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
} }
} }
} }
}
// On OS X, we claim all keyboard events while // On OS X, we claim all keyboard events while
// emulation is running to avoid wxWidgets sounding // emulation is running to avoid wxWidgets sounding
// the system beep for unhandled key events when // the system beep for unhandled key events when