From de50fead5ce0d0afb9968fe6d751692c3ab0a1b7 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 9 Nov 2016 01:45:30 +0100 Subject: [PATCH] FrameTools: Avoid deadlock in UpdateGUI(). --- Source/Core/DolphinWX/FrameTools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index ee9903ea5a..5ac1c67c9b 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1426,8 +1426,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);