diff options
| author | Jules Blok <jules.blok@gmail.com> | 2016-11-10 16:50:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 16:50:13 +0100 |
| commit | 03878a44e1fac47e30bb04ae424570aeafca9619 (patch) | |
| tree | d0f24d7c4ef4ca4ec3a5659761058dec3109d710 /Source/Core | |
| parent | 208ca4dd1584fb02cab301920209e40e889ed8f2 (diff) | |
| parent | de50fead5ce0d0afb9968fe6d751692c3ab0a1b7 (diff) | |
Merge pull request #4433 from Armada651/the-emu-that-runs-faster-than-its-race-condition
FrameTools: Avoid deadlock in UpdateGUI().
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index d4e3c642e5..58f8c34afb 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1404,8 +1404,8 @@ void CFrame::UpdateGUI() // Tools GetMenuBar()->FindItem(IDM_CHEATS)->Enable(SConfig::GetInstance().bEnableCheats); - bool ShouldEnableWiimotes = Initialized && SConfig::GetInstance().bWii && - !SConfig::GetInstance().m_bt_passthrough_enabled; + bool ShouldEnableWiimotes = + Running && SConfig::GetInstance().bWii && !SConfig::GetInstance().m_bt_passthrough_enabled; GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Enable(ShouldEnableWiimotes); GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Enable(ShouldEnableWiimotes); GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Enable(ShouldEnableWiimotes); |