diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index 33eab853e4..e6c5fce20e 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -169,12 +169,25 @@ void HotkeyScheduler::Run() HotkeyManagerEmu::GetStatus(true); - if (!Core::IsRunningAndStarted()) - continue; - + // Open if (IsHotkey(HK_OPEN)) emit Open(); + // Refresh Game List + if (IsHotkey(HK_REFRESH_LIST)) + emit RefreshGameListHotkey(); + + // Recording + if (IsHotkey(HK_START_RECORDING)) + emit StartRecording(); + + // Exit + if (IsHotkey(HK_EXIT)) + emit ExitHotkey(); + + if (!Core::IsRunningAndStarted()) + continue; + // Disc if (IsHotkey(HK_EJECT_DISC)) @@ -192,10 +205,6 @@ void HotkeyScheduler::Run() Common::SleepCurrentThread(100); } - // Refresh Game List - if (IsHotkey(HK_REFRESH_LIST)) - emit RefreshGameListHotkey(); - // Pause and Unpause if (IsHotkey(HK_PLAY_PAUSE)) emit TogglePauseHotkey(); @@ -215,10 +224,6 @@ void HotkeyScheduler::Run() if (IsHotkey(HK_SCREENSHOT)) emit ScreenShotHotkey(); - // Exit - if (IsHotkey(HK_EXIT)) - emit ExitHotkey(); - // Unlock Cursor if (IsHotkey(HK_UNLOCK_CURSOR)) emit UnlockCursor(); @@ -232,10 +237,6 @@ void HotkeyScheduler::Run() if (IsHotkey(HK_REQUEST_GOLF_CONTROL)) emit RequestGolfControl(); - // Recording - if (IsHotkey(HK_START_RECORDING)) - emit StartRecording(); - if (IsHotkey(HK_EXPORT_RECORDING)) emit ExportRecording();