diff options
| author | skidau <skidau@gmail.com> | 2015-03-24 11:58:11 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-24 11:58:11 +1100 |
| commit | 01cb364c7a93500ce2fb22c4222947dabbdd0696 (patch) | |
| tree | e8132f36c2719ae44f8edc362e7944baa0ed56c9 /Source/Core/DolphinWX/Frame.cpp | |
| parent | a0138e19ccc0c7f9cf0a34a22866506d2e9ba409 (diff) | |
| parent | bc1d62036bc1b7bb656fa0d534909d4e6d7cda4c (diff) | |
Merge pull request #2243 from lioncash/osx-stuff
DolphinWX: Fix a crash that occurs on OSX.
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; } |