From 3709a1ce3af08d5fdcf653fb81c2a6a7e2bbd2ae Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 4 Feb 2015 18:48:19 +1100 Subject: Fixed the crash which occurred when opening Wiimote configuration before a game was started. --- Source/Core/DolphinWX/Frame.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index dc6aa79ac1..2446cb4cd3 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -52,6 +52,7 @@ #include "Core/HW/DVDInterface.h" #include "Core/HW/GCKeyboard.h" #include "Core/HW/GCPad.h" +#include "Core/HW/Wiimote.h" #include "DolphinWX/Frame.h" #include "DolphinWX/GameListCtrl.h" @@ -356,10 +357,12 @@ bool CFrame::InitControllers() HotkeyManagerEmu::Initialize(reinterpret_cast(win)); Pad::Initialize(reinterpret_cast(win)); Keyboard::Initialize(reinterpret_cast(win)); + Wiimote::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())); #endif return true; } @@ -516,9 +519,10 @@ CFrame::~CFrame() if (m_bHotkeysInit) { - HotkeyManagerEmu::Shutdown(); + Wiimote::Shutdown(); Keyboard::Shutdown(); Pad::Shutdown(); + HotkeyManagerEmu::Shutdown(); m_bHotkeysInit = false; } -- cgit v1.2.3