piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

4
Source/Core/DolphinQt2/Updater.cpp
View File

@ -30,7 +30,7 @@ void Updater::OnUpdateAvailable(const NewVersionInformation& info)
{
bool later = false;
int choice = RunOnObject(m_parent, [&] {
std::optional<int> choice = RunOnObject(m_parent, [&] {
QDialog* dialog = new QDialog(m_parent);
dialog->setWindowTitle(tr("Update available"));
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
@ -79,7 +79,7 @@ void Updater::OnUpdateAvailable(const NewVersionInformation& info)
return dialog->exec();
});
if (choice == QDialog::Accepted)
if (choice && *choice == QDialog::Accepted)
{
TriggerUpdate(info, later ? AutoUpdateChecker::RestartMode::NO_RESTART_AFTER_UPDATE :
AutoUpdateChecker::RestartMode::RESTART_AFTER_UPDATE);