diff options
author | FearlessTobi <thm.frey@gmail.com> | 2022-07-30 05:58:23 +0200 |
---|---|---|
committer | FearlessTobi <thm.frey@gmail.com> | 2022-08-15 20:25:42 +0200 |
commit | f80c7c4cd5c090b9a31f89a0eb3d86cbe928c50b (patch) | |
tree | ad359908ba2d3cd003082b39cc7217b61e5b18f6 /src/yuzu/multiplayer/direct_connect.cpp | |
parent | 035ca99b023ee776bc13c79f96a5c6b1bc049739 (diff) |
core, network: Add ability to proxy socket packets
Diffstat (limited to 'src/yuzu/multiplayer/direct_connect.cpp')
-rw-r--r-- | src/yuzu/multiplayer/direct_connect.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/yuzu/multiplayer/direct_connect.cpp b/src/yuzu/multiplayer/direct_connect.cpp index 9000c4531..4c0ea0a6b 100644 --- a/src/yuzu/multiplayer/direct_connect.cpp +++ b/src/yuzu/multiplayer/direct_connect.cpp @@ -97,9 +97,9 @@ void DirectConnectWindow::Connect() { QFuture<void> f = QtConcurrent::run([&] { if (auto room_member = room_network.GetRoomMember().lock()) { auto port = UISettings::values.multiplayer_port.GetValue(); - room_member->Join(ui->nickname->text().toStdString(), "", - ui->ip->text().toStdString().c_str(), port, 0, - Network::NoPreferredMac, ui->password->text().toStdString().c_str()); + room_member->Join(ui->nickname->text().toStdString(), + ui->ip->text().toStdString().c_str(), port, 0, Network::NoPreferredIP, + ui->password->text().toStdString().c_str()); } }); watcher->setFuture(f); @@ -121,9 +121,7 @@ void DirectConnectWindow::OnConnection() { EndConnecting(); if (auto room_member = room_network.GetRoomMember().lock()) { - if (room_member->GetState() == Network::RoomMember::State::Joined || - room_member->GetState() == Network::RoomMember::State::Moderator) { - + if (room_member->IsConnected()) { close(); } } |