diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 4d6e393104..93f999bf0f 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -161,25 +161,27 @@ CPanel::CPanel( return 0; case WIIMOTE_DISCONNECT: - if (main_frame->bNoWiimoteMsg) - main_frame->bNoWiimoteMsg = false; - else - { - // The Wiimote has been disconnect, we offer reconnect here - wxMessageDialog *dlg = new wxMessageDialog( - this, - wxString::Format(wxT("Wiimote %i has been disconnected by system.\n") - wxT("Maybe this game doesn't support multi-wiimote,\n") - wxT("or maybe it is due to idle time out or other reason.\n\n") - wxT("Do you want to reconnect immediately?"), lParam + 1), - wxT("Reconnect Wiimote Confirm"), - wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION, - wxDefaultPosition); + if( SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ){ //Only Alerts if the game is a wii game. + if (main_frame->bNoWiimoteMsg) + main_frame->bNoWiimoteMsg = false; + else + { + // The Wiimote has been disconnect, we offer reconnect here + wxMessageDialog *dlg = new wxMessageDialog( + this, + wxString::Format(wxT("Wiimote %i has been disconnected by system.\n") + wxT("Maybe this game doesn't support multi-wiimote,\n") + wxT("or maybe it is due to idle time out or other reason.\n\n") + wxT("Do you want to reconnect immediately?"), lParam + 1), + wxT("Reconnect Wiimote Confirm"), + wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION, + wxDefaultPosition); - if (dlg->ShowModal() == wxID_YES) - GetUsbPointer()->AccessWiiMote(lParam | 0x100)->Activate(true); + if (dlg->ShowModal() == wxID_YES) + GetUsbPointer()->AccessWiiMote(lParam | 0x100)->Activate(true); - dlg->Destroy(); + dlg->Destroy(); + } } return 0; }