diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-07-21 02:09:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:09:02 +0200 |
| commit | c141511c87a8edfa1f273e8fdb13609def89efa8 (patch) | |
| tree | bc5e0c9ab8db9b31101fc69dfaa88abce3043207 /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | bcd2a76f2b19c3f091a91201c39fe6839a416970 (diff) | |
| parent | 4407854e9cbffeb8da1d7a8e70186b6d7498bccb (diff) | |
Merge pull request #7222 from Techjar/netplay-sync-saves
NetPlay save data synchronization
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index ab773e9b2d..30fdaef58f 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1100,6 +1100,9 @@ bool MainWindow::NetPlayJoin() return false; } + if (Settings::Instance().GetNetPlayServer() != nullptr) + Settings::Instance().GetNetPlayServer()->SetNetPlayUI(m_netplay_dialog); + m_netplay_setup_dialog->close(); m_netplay_dialog->show(nickname, is_traversal); |