Merge pull request #6769 from spycrab/qt_fix_netplay

Qt/NetPlay: Fix crashes on start
dolphin-emu · May 7, 2018 · 8212b6e · 8212b6e
2 parents ecd9b94 + e184dc5
commit 8212b6e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -955,6 +955,7 @@ bool MainWindow::NetPlayJoin()
   {
     QMessageBox::critical(nullptr, QObject::tr("Error"),
                           QObject::tr("Failed to connect to server"));
+    NetPlayQuit();
     return false;
   }
 
@@ -1004,6 +1005,7 @@ bool MainWindow::NetPlayHost(const QString& game_id)
         QObject::tr(
             "Failed to listen on port %1. Is another instance of the NetPlay server running?")
             .arg(host_port));
+    NetPlayQuit();
     return false;
   }