mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-02 00:12:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

QtUtils/RunOnObject: Make safe under object destruction

Browse source 
Co-Authored-By: cancel <cancel@cancel.fm>
This commit is contained in:
riking 2018-05-21 15:27:12 -07:00
parent f31f1a08fb
commit 268b424843
5 changed files with 61 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
View file

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