From 78d5d265bbbb785284207261612b2bae41785621 Mon Sep 17 00:00:00 2001 From: Dmugetsu Date: Fri, 21 Feb 2025 20:51:57 -0600 Subject: [PATCH] fixes and suggestions --- src/qt_gui/check_update.cpp | 8 +++++--- src/qt_gui/main_window.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/qt_gui/check_update.cpp b/src/qt_gui/check_update.cpp index f6f8b3f41..f8b3c01de 100644 --- a/src/qt_gui/check_update.cpp +++ b/src/qt_gui/check_update.cpp @@ -29,7 +29,7 @@ using namespace Common::FS; -CheckUpdate::CheckUpdate(MainWindow* mainWindow, bool showMessage, QWidget* parent) +CheckUpdate::CheckUpdate(MainWindow* mainWindow, const bool showMessage, QWidget* parent) : QDialog(parent), networkManager(new QNetworkAccessManager(this)), m_mainWindow(mainWindow) { setWindowTitle(tr("Auto Updater")); setFixedSize(0, 0); @@ -424,8 +424,10 @@ void CheckUpdate::DownloadUpdate(const QString& url) { void CheckUpdate::Install() { if (m_mainWindow && m_mainWindow->isGameRunning) { QMessageBox::warning(this, tr("Update Warning"), - tr("A game is currently running. Please close the game to prevent " - "save file corruption.")); + // clang-format off + tr("A game is currently running. Please close the game to prevent save file corruption.")); + // clang-format on + m_mainWindow->StopGameforUpdate(false); } diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp index af0adefbc..726192193 100644 --- a/src/qt_gui/main_window.cpp +++ b/src/qt_gui/main_window.cpp @@ -226,10 +226,12 @@ void MainWindow::LoadGameLists() { #ifdef ENABLE_UPDATER void MainWindow::CheckUpdateMain(bool checkSave) { - if (checkSave && !Config::autoUpdate()) { - return; + if (checkSave) { + if (!Config::autoUpdate()) { + return; + } } - auto checkUpdate = new CheckUpdate(this, false, this); + auto checkUpdate = new CheckUpdate(this, true, this); checkUpdate->exec(); } #endif