From 552427ffc3a1a997987f14dcd2ea0a62f3712202 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 15 Dec 2020 15:02:33 +0100 Subject: [PATCH] Update windows launch on start binary location Fixes: #7672 --- src/common/utility_win.cpp | 2 +- src/gui/generalsettings.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/utility_win.cpp b/src/common/utility_win.cpp index 8a56bcd41..c6f9c0066 100644 --- a/src/common/utility_win.cpp +++ b/src/common/utility_win.cpp @@ -94,7 +94,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName, QString runPath = QLatin1String(runPathC); QSettings settings(runPath, QSettings::NativeFormat); if (enable) { - settings.setValue(appName, QCoreApplication::applicationFilePath().replace(QLatin1Char('/'), QLatin1Char('\\'))); + settings.setValue(appName, QDir::toNativeSeparators(QCoreApplication::applicationFilePath())); } else { settings.remove(appName); } diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 1e87d7ae6..0f4c21f52 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -161,7 +161,10 @@ GeneralSettings::GeneralSettings(QWidget *parent) _ui->autostartCheckBox->setDisabled(true); _ui->autostartCheckBox->setToolTip(tr("You cannot disable autostart because system-wide autostart is enabled.")); } else { - _ui->autostartCheckBox->setChecked(Utility::hasLaunchOnStartup(Theme::instance()->appName())); + const bool hasAutoStart = Utility::hasLaunchOnStartup(Theme::instance()->appName()); + // make sure the binary location is correctly set + slotToggleLaunchOnStartup(hasAutoStart); + _ui->autostartCheckBox->setChecked(hasAutoStart); connect(_ui->autostartCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotToggleLaunchOnStartup); } -- 2.30.2