Merge pull request #5471 from vitor-k/misc

Fix some warnings and some small changes
2021-04-23 22:54:00 -07:00
parent 78b8dfc808 7e19ed1309
commit 24086d05bb
35 changed files with 110 additions and 117 deletions
--- a/src/citra_qt/multiplayer/state.cpp
+++ b/src/citra_qt/multiplayer/state.cpp
@@ -232,9 +232,8 @@ bool MultiplayerState::OnCloseRoom() {
            return true;
        }
        // Save ban list
-        if (auto room = Network::GetRoom().lock()) {
-            UISettings::values.ban_list = std::move(room->GetBanList());
-        }
+        UISettings::values.ban_list = std::move(room->GetBanList());
+
        room->Destroy();
        announce_multiplayer_session->Stop();
        LOG_DEBUG(Frontend, "Closed the room (as a server)");