From e01bdeddf289177b768ff46c8db1655464c9e69e Mon Sep 17 00:00:00 2001 From: Summate Date: Sat, 7 May 2016 05:09:52 -0500 Subject: [PATCH] Piping the wxMsgAlert through netplay window during netplay instead of running a blocking messagebox --- Source/Core/DolphinWX/Main.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index e085a94bb2..bd24b3b0e3 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -42,6 +42,7 @@ #include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/JitWindow.h" +#include "DolphinWX/NetPlay/NetWindow.h" #include "UICommon/UICommon.h" @@ -366,10 +367,21 @@ bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style* { #ifdef __WXGTK__ if (wxIsMainThread()) + { #endif - return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption), - (yes_no) ? wxYES_NO : wxOK, wxWindow::FindFocus()); + NetPlayDialog*& npd = NetPlayDialog::GetInstance(); + if (npd == nullptr) + { + return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption), + (yes_no) ? wxYES_NO : wxOK, wxWindow::FindFocus()); + } + else + { + npd->AppendChat("/!\\ " + std::string{text}); + return true; + } #ifdef __WXGTK__ + } else { wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_PANIC);