Merge pull request #4433 from Armada651/the-emu-that-runs-faster-than-its-race-condition

FrameTools: Avoid deadlock in UpdateGUI().
This commit is contained in:
Jules Blok 2016-11-10 16:50:13 +01:00 committed by GitHub
commit 03878a44e1

View File

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