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

Remove duplicated logic in HostRoom

Browse source 
Fixes some issues with multiple warning messages
This commit is contained in:
James Rowe 2018-04-18 11:04:32 -06:00
parent 2be02f221d
commit a5c8e07f46
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/citra_qt/multiplayer/state.cpp
View file

@ -112,9 +112,9 @@ void MultiplayerState::OnCreateRoom() {
BringWidgetToFront(host_room);
}
void MultiplayerState::OnCloseRoom() {
bool MultiplayerState::OnCloseRoom() {
if (!NetworkMessage::WarnCloseRoom())
return;
return false;
if (auto room = Network::GetRoom().lock()) {
// if you are in a room, leave it
if (auto member = Network::GetRoomMember().lock()) {
@ -123,11 +123,12 @@ void MultiplayerState::OnCloseRoom() {
// if you are hosting a room, also stop hosting
if (room->GetState() != Network::Room::State::Open) {
return;
return true;
}
room->Destroy();
announce_multiplayer_session->Stop();
}
return true;
}
void MultiplayerState::OnOpenNetworkRoom() {