archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

DolphinWX: Allow input subsystems to correctly deinitialize

Browse source 
Previously InitControllers() would be called every poll duration, setting this boolean to false which would prevent said sybsystems from deinitializing correctly.
This commit is contained in:
Lioncash 2015-03-01 01:23:18 -05:00
parent d3c9701eb6
commit 3981212031
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/Core/DolphinWX/Frame.cpp
View file

@ -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)
{

1
Source/Core/DolphinWX/Frame.h
View file

@ -176,7 +176,6 @@ private:
bool m_bGameLoading;
bool m_bClosing;
bool m_confirmStop;
bool m_bHotkeysInit;
std::vector<std::string> drives;