From: Hannah von Reth <hannah.vonreth@owncloud.com>
Date: Tue, 15 Dec 2020 14:02:33 +0000 (+0100)
Subject: Update windows launch on start binary location
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~446^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=552427ffc3a1a997987f14dcd2ea0a62f3712202;p=nextcloud-desktop.git

Update windows launch on start binary location

Fixes: #7672
---

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);
     }