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(win)); Pad::Initialize(reinterpret_cast(win)); Keyboard::Initialize(reinterpret_cast(win)); Wiimote::Initialize(reinterpret_cast(win)); + HotkeyManagerEmu::Initialize(reinterpret_cast(win)); #else - HotkeyManagerEmu::Initialize(reinterpret_cast(GetHandle())); Pad::Initialize(reinterpret_cast(GetHandle())); Keyboard::Initialize(reinterpret_cast(GetHandle())); Wiimote::Initialize(reinterpret_cast(GetHandle())); + HotkeyManagerEmu::Initialize(reinterpret_cast(GetHandle())); #endif return true; }