Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
James Rowe 2018-04-20 00:39:01 -06:00
parent 5fef22fc52
commit c7726f13e8
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/citra_qt/multiplayer/client_room.cpp
View file

@ -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()) {
return;
}
if (auto member = Network::GetRoomMember().lock()) {
member->Leave();
auto parent = static_cast<MultiplayerState*>(parentWidget());
if (!parent->OnCloseRoom()) {
ui->chat->AppendStatusMessage(tr("Disconnected"));
close();
}