diff options
| author | Léo Lam <leo@leolam.fr> | 2020-03-15 22:22:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-15 22:22:00 +0100 |
| commit | 466c079bf4c7d22f9ef2cbd555fd004a28bddbf4 (patch) | |
| tree | 901fed35593c476e5b48cb39dd8feb8ec3ad5d31 /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | d297080f52425563dec8c83f837447bb8127efed (diff) | |
| parent | 06a9f6ef82f49a858cb3ae1167ffcc776a11c34a (diff) | |
Merge pull request #8604 from Techjar/netplay-index-direct
Core/NetPlayServer: Fix session not being added to index on direct connection type
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 9de5883cf8..3e97e37a5f 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1338,9 +1338,6 @@ bool MainWindow::NetPlayJoin() return false; } - if (server != nullptr) - server->SetNetPlayUI(m_netplay_dialog); - m_netplay_setup_dialog->close(); m_netplay_dialog->show(nickname, is_traversal); @@ -1378,7 +1375,7 @@ bool MainWindow::NetPlayHost(const QString& game_id) // Create Server Settings::Instance().ResetNetPlayServer(new NetPlay::NetPlayServer( - host_port, use_upnp, + host_port, use_upnp, m_netplay_dialog, NetPlay::NetTraversalConfig{is_traversal, traversal_host, traversal_port})); if (!Settings::Instance().GetNetPlayServer()->is_connected) |