diff options
| author | FearlessTobi <thm.frey@gmail.com> | 2022-08-27 03:41:19 +0200 |
|---|---|---|
| committer | FearlessTobi <thm.frey@gmail.com> | 2022-08-27 03:41:19 +0200 |
| commit | 2b6ac4463c06cfdf50b1d150311a217d2ee11688 (patch) | |
| tree | b3c6e200499949a98a42b05f96bcc01134ca2ef5 /src/yuzu/multiplayer/state.cpp | |
| parent | 339758c9fce9a211f85f62182d8fa0e1115c229b (diff) | |
yuzu/multiplayer: Warn when game is running or no network interface is selected
Diffstat (limited to 'src/yuzu/multiplayer/state.cpp')
| -rw-r--r-- | src/yuzu/multiplayer/state.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/yuzu/multiplayer/state.cpp b/src/yuzu/multiplayer/state.cpp index dba76b22b0..d1a68b1829 100644 --- a/src/yuzu/multiplayer/state.cpp +++ b/src/yuzu/multiplayer/state.cpp @@ -19,10 +19,9 @@ #include "yuzu/util/clickable_label.h" MultiplayerState::MultiplayerState(QWidget* parent, QStandardItemModel* game_list_model_, - QAction* leave_room_, QAction* show_room_, - Network::RoomNetwork& room_network_) + QAction* leave_room_, QAction* show_room_, Core::System& system_) : QWidget(parent), game_list_model(game_list_model_), leave_room(leave_room_), - show_room(show_room_), room_network{room_network_} { + show_room(show_room_), system{system_}, room_network{system.GetRoomNetwork()} { if (auto member = room_network.GetRoomMember().lock()) { // register the network structs to use in slots and signals state_callback_handle = member->BindOnStateChanged( @@ -208,15 +207,14 @@ static void BringWidgetToFront(QWidget* widget) { void MultiplayerState::OnViewLobby() { if (lobby == nullptr) { - lobby = new Lobby(this, game_list_model, announce_multiplayer_session, room_network); + lobby = new Lobby(this, game_list_model, announce_multiplayer_session, system); } BringWidgetToFront(lobby); } void MultiplayerState::OnCreateRoom() { if (host_room == nullptr) { - host_room = - new HostRoomWindow(this, game_list_model, announce_multiplayer_session, room_network); + host_room = new HostRoomWindow(this, game_list_model, announce_multiplayer_session, system); } BringWidgetToFront(host_room); } @@ -279,7 +277,7 @@ void MultiplayerState::OnOpenNetworkRoom() { void MultiplayerState::OnDirectConnectToRoom() { if (direct_connect == nullptr) { - direct_connect = new DirectConnectWindow(room_network, this); + direct_connect = new DirectConnectWindow(system, this); } BringWidgetToFront(direct_connect); } |