diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-02-23 16:00:01 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-02-23 16:00:01 +0000 |
| commit | 1eaad0966cb5e6ee70b146da9f6d5daeeeeab91c (patch) | |
| tree | 23857130d2063d16fb8b034922a19f8e855f52e0 /Source/Core | |
| parent | 9680d3ac95f733e9bf67fa778706771b8c1c746a (diff) | |
Still didn't quite have the wiimote connection stuff right. This probably needs to be heavily revised.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7232 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/MsgHandler.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index 63406c6312..57f8fd83fc 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -54,7 +54,6 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...) // Read message and write it to the log std::string caption; char buffer[2048]; - bool ret = true; static std::string info_caption; static std::string warn_caption; @@ -88,10 +87,10 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...) ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer); // Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored - if (msg_handler && (AlertEnabled || Style == QUESTION)) { - ret = msg_handler(caption.c_str(), buffer, yes_no, Style); - } - return ret; + if (msg_handler && (AlertEnabled || Style == QUESTION)) + return msg_handler(caption.c_str(), buffer, yes_no, Style); + + return true; } // Default non library depended panic alert diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index 0d3e91a340..6e9520c19e 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -144,7 +144,7 @@ void WiimoteConfigPage::UpdateWiimoteStatus() // Connect wiimotes if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index]) CFrame::ConnectWiimote(m_index, true); - else if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && orig_source & WIIMOTE_SRC_EMU) + else if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index]) CFrame::ConnectWiimote(m_index, WiimoteReal::g_wiimotes[m_index]->IsConnected()); } } |