ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4042 from leoetlino/where-did-the-panicalert-go 

Don't pipe PanicAlerts to netplay window if it isn't opened
This commit is contained in:
Anthony Serna 2016-07-23 13:57:39 -05:00 committed by GitHub
parent 78b68b707f 574468c95b
commit aa34e5e20e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/Main.cpp
View File

@ -372,16 +372,13 @@ bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*
{ {
#endif #endif
NetPlayDialog*& npd = NetPlayDialog::GetInstance(); NetPlayDialog*& npd = NetPlayDialog::GetInstance();
if (npd == nullptr) if (npd != nullptr && npd->IsShown())
{
return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption),
(yes_no) ? wxYES_NO : wxOK, wxWindow::FindFocus());
}
else
{ {
npd->AppendChat("/!\\ " + std::string{text}); npd->AppendChat("/!\\ " + std::string{text});
return true; return true;
} }
return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption), (yes_no) ? wxYES_NO : wxOK,
wxWindow::FindFocus());
#ifdef __WXGTK__ #ifdef __WXGTK__
} }
else else