piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7938 from Techjar/netplay-pending-start-stall

Browse Source 
NetPlay: Fix hosting being stuck if player leaves during pending start
This commit is contained in:
spycrab
2019-04-09 13:07:17 +02:00
committed by GitHub
parent 746849f891 c90df946ba
commit 627a1a90c1
9 changed files with 140 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp
View File

@ -53,15 +53,18 @@ void ChunkedProgressDialog::CreateWidgets()
m_main_layout = new QVBoxLayout;
m_progress_box = new QGroupBox;
m_progress_layout = new QVBoxLayout;
m_button_box = new QDialogButtonBox(QDialogButtonBox::NoButton);
m_progress_box->setLayout(m_progress_layout);
m_main_layout->addWidget(m_progress_box);
m_main_layout->addWidget(m_button_box);
setLayout(m_main_layout);
}
void ChunkedProgressDialog::ConnectWidgets()
{
connect(m_button_box, &QDialogButtonBox::rejected, this, &ChunkedProgressDialog::reject);
}
void ChunkedProgressDialog::show(const QString& title, const u64 data_size,
@ -89,6 +92,21 @@ void ChunkedProgressDialog::show(const QString& title, const u64 data_size,
if (!client)
return;
if (Settings::Instance().GetNetPlayServer())
{
m_button_box->setStandardButtons(QDialogButtonBox::Cancel);
QPushButton* cancel_button = m_button_box->button(QDialogButtonBox::Cancel);
cancel_button->setAutoDefault(false);
cancel_button->setDefault(false);
}
else
{
m_button_box->setStandardButtons(QDialogButtonBox::Close);
QPushButton* close_button = m_button_box->button(QDialogButtonBox::Close);
close_button->setAutoDefault(false);
close_button->setDefault(false);
}
for (const auto* player : client->GetPlayers())
{
if (std::find(players.begin(), players.end(), player->pid) == players.end())
@ -121,3 +139,13 @@ void ChunkedProgressDialog::SetProgress(const int pid, const u64 progress)
QString::fromStdString(StringFromFormat("%.2f", total))));
m_progress_bars[pid]->setValue(prog);
}
void ChunkedProgressDialog::reject()
{
auto server = Settings::Instance().GetNetPlayServer();
if (server)
server->AbortGameStart();
QDialog::reject();
}

4
Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h
View File

@ -12,6 +12,7 @@
#include "Common/CommonTypes.h"
class QDialogButtonBox;
class QGroupBox;
class QLabel;
class QProgressBar;
@ -27,6 +28,8 @@ public:
void show(const QString& title, u64 data_size, const std::vector<int>& players);
void SetProgress(int pid, u64 progress);
void reject() override;
private:
void CreateWidgets();
void ConnectWidgets();
@ -38,4 +41,5 @@ private:
QGroupBox* m_progress_box;
QVBoxLayout* m_progress_layout;
QVBoxLayout* m_main_layout;
QDialogButtonBox* m_button_box;
};

8
Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
View File

@ -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)

2
Source/Core/DolphinQt/NetPlay/NetPlayDialog.h
View File

@ -57,7 +57,7 @@ public:
void OnConnectionError(const std::string& message) override;
void OnTraversalError(TraversalClient::FailureReason error) override;
void OnTraversalStateChanged(TraversalClient::State state) override;
void OnSaveDataSyncFailure() override;
void OnGameStartAborted() override;
void OnGolferChanged(bool is_golfer, const std::string& golfer_name) override;
bool IsRecording() override;