diff options
| author | skidau <skidau@gmail.com> | 2015-03-05 19:49:10 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-08 20:27:13 +1100 |
| commit | 780eef68f6ec7deee1a11f8bc1386f70133b6cc0 (patch) | |
| tree | 9817364bdf1ac1e9ff73de1029a07e45b32c8f5e /Source/Core/DolphinWX/Frame.cpp | |
| parent | b446ea013241fc28797f5bfdfdb40b374394baed (diff) | |
Fixed the crash that would occur when the Refresh button was pressed in the controllers config.
- Simplified the locking mechanism when controllers were updated
- Reloaded the config of the controls instead of re-initialising the control plugins
- Fixed controls being unresponsive after the Refresh button was pressed
- Disables the hotkeys while the controller config is open
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 9352dcb367..b6b28a57f2 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1263,7 +1263,7 @@ const CGameListCtrl *CFrame::GetGameListCtrl() const void CFrame::PollHotkeys(wxTimerEvent& event) { - if (!HotkeyManagerEmu::IsReady()) + if (!HotkeyManagerEmu::IsEnabled()) return; if (Core::GetState() == Core::CORE_UNINITIALIZED || Core::GetState() == Core::CORE_PAUSE) |