Frontend: Prevent a crash from closing a hosted room using the Disconnect button and then trying to host another room

src/citra_qt/multiplayer/client_room.cpp

@@ -13,6 +13,7 @@
 #include "citra_qt/game_list_p.h"
 #include "citra_qt/multiplayer/client_room.h"
 #include "citra_qt/multiplayer/message.h"
+#include "citra_qt/multiplayer/state.h"
 #include "common/logging/log.h"
 #include "core/announce_multiplayer_session.h"
 #include "ui_client_room.h"
@@ -57,11 +58,8 @@ void ClientRoomWindow::OnStateChange(const Network::RoomMember::State& state) {
 }
 
 void ClientRoomWindow::Disconnect() {
-    if (!NetworkMessage::WarnDisconnect()) {
+    auto parent = static_cast<MultiplayerState*>(parentWidget());
-        return;
+    if (!parent->OnCloseRoom()) {
-    }
-    if (auto member = Network::GetRoomMember().lock()) {
-        member->Leave();
         ui->chat->AppendStatusMessage(tr("Disconnected"));
         close();
     }

src/citra_qt/multiplayer/state.cpp

@@ -147,6 +147,7 @@ bool MultiplayerState::OnCloseRoom() {
         // if you are in a room, leave it
         if (auto member = Network::GetRoomMember().lock()) {
             member->Leave();
+            NGLOG_DEBUG(Frontend, "Left the room (as a client)");
         }
 
         // if you are hosting a room, also stop hosting
@@ -155,6 +156,7 @@ bool MultiplayerState::OnCloseRoom() {
         }
         room->Destroy();
         announce_multiplayer_session->Stop();
+        NGLOG_DEBUG(Frontend, "Closed the room (as a server)");
     }
     return true;
 }

src/citra_qt/multiplayer/state.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <QWidget>
+#include "core/announce_multiplayer_session.h"
 #include "network/network.h"
 
 class QStandardItemModel;