diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-03-23 08:32:30 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-03-23 08:36:13 -0400 |
| commit | 7dcb6a3e6c344e864afb77c0b859fbbbaefa680b (patch) | |
| tree | 57f1b1bbad93a192e7f9de08dd083ffafc5f085e /Source/Core/DolphinWX/Frame.cpp | |
| parent | a0138e19ccc0c7f9cf0a34a22866506d2e9ba409 (diff) | |
DolphinWX: Initialize the HotkeyManager after input backends are initialized
Previously OSX would crash upon loading. This is because the UI would be polling for hotkey inputs but was doing so before the inputs backends were initialized.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 1974717ef5..66d5409bc1 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -358,15 +358,15 @@ bool CFrame::InitControllers() { #if defined(HAVE_X11) && HAVE_X11 Window win = X11Utils::XWindowFromHandle(GetHandle()); - HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(win)); Pad::Initialize(reinterpret_cast<void*>(win)); Keyboard::Initialize(reinterpret_cast<void*>(win)); Wiimote::Initialize(reinterpret_cast<void*>(win)); + HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(win)); #else - HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(GetHandle())); Pad::Initialize(reinterpret_cast<void*>(GetHandle())); Keyboard::Initialize(reinterpret_cast<void*>(GetHandle())); Wiimote::Initialize(reinterpret_cast<void*>(GetHandle())); + HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(GetHandle())); #endif return true; } |