summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-02-28 11:29:57 +1100
committerskidau <skidau@gmail.com>2015-03-08 20:27:12 +1100
commit679d9351eadda908a3056994f26ef0db0eaecddd (patch)
treefa9a6a80882328d68466f60ed858e26fbf1662c3 /Source
parentcc6b55ee2a29aa54dace480ecf5dd8bef6258b72 (diff)
Fixed the Connect Wiimote hotkeys from getting activated while a GameCube game is running.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 7e19c092fa..56a6d7402e 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1433,7 +1433,7 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
// Actually perform the Wiimote connection or disconnection
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
- if (WiimoteId >= 0)
+ if (WiimoteId >= 0 && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
{
wxCommandEvent evt;
evt.SetId(IDM_CONNECT_WIIMOTE1 + WiimoteId);