diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2019-04-09 13:07:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 13:07:17 +0200 |
| commit | 627a1a90c1448ae8a1e0e40ba6fca9229d65e509 (patch) | |
| tree | 44288e394d84c5da7799dd337065ecdba0390053 /Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | |
| parent | 746849f8919d0f3b28738d2e70c4fdb707e01dd7 (diff) | |
| parent | c90df946bae7fb6d11e61efbf57e2da0af848c11 (diff) | |
Merge pull request #7938 from Techjar/netplay-pending-start-stall
NetPlay: Fix hosting being stuck if player leaves during pending start
Diffstat (limited to 'Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index e9592ca1fb..08d025b285 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -553,6 +553,8 @@ void NetPlayDialog::show(std::string nickname, bool use_traversal) m_game_button->setEnabled(is_hosting); m_kick_button->setEnabled(false); + SetOptionsEnabled(true); + QDialog::show(); UpdateGUI(); } @@ -973,7 +975,7 @@ void NetPlayDialog::OnTraversalStateChanged(TraversalClient::State state) } } -void NetPlayDialog::OnSaveDataSyncFailure() +void NetPlayDialog::OnGameStartAborted() { QueueOnObject(this, [this] { SetOptionsEnabled(true); }); } @@ -1094,7 +1096,7 @@ void NetPlayDialog::ShowChunkedProgressDialog(const std::string& title, const u6 { QueueOnObject(this, [this, title, data_size, players] { if (m_chunked_progress_dialog->isVisible()) - m_chunked_progress_dialog->close(); + m_chunked_progress_dialog->done(QDialog::Accepted); m_chunked_progress_dialog->show(QString::fromStdString(title), data_size, players); }); @@ -1102,7 +1104,7 @@ void NetPlayDialog::ShowChunkedProgressDialog(const std::string& title, const u6 void NetPlayDialog::HideChunkedProgressDialog() { - QueueOnObject(this, [this] { m_chunked_progress_dialog->close(); }); + QueueOnObject(this, [this] { m_chunked_progress_dialog->done(QDialog::Accepted); }); } void NetPlayDialog::SetChunkedProgress(const int pid, const u64 progress) |