summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-05-22 01:03:20 +0200
committerGitHub <noreply@github.com>2018-05-22 01:03:20 +0200
commit302093d777c895ee7b04df5f02de347d65622b52 (patch)
treecd1d10ab07f47a2a9cce7069c558bc7cb6324ca2 /Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
parentf31f1a08fb8dca9e51e79d1d3a65ee8bff38273b (diff)
parent268b424843c859d5d063dfa2da8b3edd7670cddc (diff)
Merge pull request #6934 from riking/runonobject
QtUtils/RunOnObject: Make safe under object destruction
Diffstat (limited to 'Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp')
-rw-r--r--Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
index 8dcd4df9db..e6d7c29800 100644
--- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
+++ b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
@@ -580,12 +580,15 @@ void NetPlayDialog::OnTraversalError(TraversalClient::FailureReason error)
bool NetPlayDialog::IsRecording()
{
- return RunOnObject(m_record_input_box, &QCheckBox::isChecked);
+ std::optional<bool> is_recording = RunOnObject(m_record_input_box, &QCheckBox::isChecked);
+ if (is_recording)
+ return *is_recording;
+ return false;
}
std::string NetPlayDialog::FindGame(const std::string& game)
{
- return RunOnObject(this, [this, game] {
+ std::optional<std::string> path = RunOnObject(this, [this, game] {
for (int i = 0; i < m_game_list_model->rowCount(QModelIndex()); i++)
{
if (m_game_list_model->GetUniqueIdentifier(i).toStdString() == game)
@@ -593,6 +596,9 @@ std::string NetPlayDialog::FindGame(const std::string& game)
}
return std::string("");
});
+ if (path)
+ return *path;
+ return std::string("");
}
void NetPlayDialog::ShowMD5Dialog(const std::string& file_identifier)