diff options
| author | Scott Mansell <phiren@gmail.com> | 2019-11-07 10:05:54 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 10:05:54 +1300 |
| commit | 93d7b3d15962a3393cf2971e14c4acf54d90cecd (patch) | |
| tree | 5166eb287ade44827badfcf2f9c937351c0295ce /Source/Core | |
| parent | 71e3c7ff205544a7fa9d232c64800c8df248352f (diff) | |
| parent | 9d18402d078f00a7011e432b93ea5a7fce8babef (diff) | |
Merge pull request #8432 from jordan-woyak/hotkey-indicator-fix
DolphinQt: Make HotkeyScheduler call UpdateInput when hotkeys are disabled.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/HotkeyScheduler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index 14949fd3f8..b2f5c86d98 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -134,12 +134,12 @@ void HotkeyScheduler::Run() { Common::SleepCurrentThread(1000 / 60); - if (!HotkeyManagerEmu::IsEnabled()) - continue; - if (Core::GetState() == Core::State::Uninitialized || Core::GetState() == Core::State::Paused) g_controller_interface.UpdateInput(); + if (!HotkeyManagerEmu::IsEnabled()) + continue; + if (Core::GetState() != Core::State::Stopping) { HotkeyManagerEmu::GetStatus(); |