diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-03-01 01:23:18 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-03-01 01:23:21 -0500 |
| commit | 39812120313ba4ff727e1f693eb52baaca14233a (patch) | |
| tree | c6c88d4cb27b1a8d5371e5df44caffa622cb27a2 /Source/Core/DolphinWX/Frame.cpp | |
| parent | d3c9701eb6add83d847d8bea92b2e2a045d2f25d (diff) | |
DolphinWX: Allow input subsystems to correctly deinitialize
Previously InitControllers() would be called every poll duration, setting this boolean to false which would prevent said sybsystems from deinitializing correctly.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 946cd52da3..82a089eb7e 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -506,7 +506,7 @@ CFrame::CFrame(wxFrame* parent, g_pCodeWindow->UpdateButtonStates(); // check if game is running - m_bHotkeysInit = InitControllers(); + InitControllers(); m_poll_hotkey_timer.SetOwner(this); Bind(wxEVT_TIMER, &CFrame::PollHotkeys, this); @@ -515,14 +515,10 @@ CFrame::CFrame(wxFrame* parent, // Destructor CFrame::~CFrame() { - if (m_bHotkeysInit) - { - Wiimote::Shutdown(); - Keyboard::Shutdown(); - Pad::Shutdown(); - HotkeyManagerEmu::Shutdown(); - m_bHotkeysInit = false; - } + Wiimote::Shutdown(); + Keyboard::Shutdown(); + Pad::Shutdown(); + HotkeyManagerEmu::Shutdown(); drives.clear(); @@ -1268,10 +1264,7 @@ const CGameListCtrl *CFrame::GetGameListCtrl() const void CFrame::PollHotkeys(wxTimerEvent& event) { if (Core::GetState() == Core::CORE_UNINITIALIZED || Core::GetState() == Core::CORE_PAUSE) - { - m_bHotkeysInit = InitControllers(); g_controller_interface.UpdateInput(); - } if (Core::GetState() != Core::CORE_STOPPING) { |