From 05a0df799ec3124ec4f0260dc874805ed17d306e Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Wed, 17 Jun 2020 17:58:24 -0400
Subject: [PATCH] Fix auto-start settings on Windows

---
 share/windows/wix-template.xml        | 2 +-
 src/gui/osutils/winutils/WinUtils.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/windows/wix-template.xml b/share/windows/wix-template.xml
index 228bf2a48..eb49f872b 100644
--- a/share/windows/wix-template.xml
+++ b/share/windows/wix-template.xml
@@ -51,7 +51,7 @@
             <RegistryValue Id="Autostart.rst" Root="HKCU" Action="write"
                     Key="Software\Microsoft\Windows\CurrentVersion\Run"
                     Name="$(var.CPACK_PACKAGE_NAME)"
-                    Value="[#CM_FP_KeePassXC.exe]"
+                    Value="&quot;[#CM_FP_KeePassXC.exe]&quot;"
                     Type="string" />
             <Condition>AUTOSTARTPROGRAM</Condition>
         </Component>
diff --git a/src/gui/osutils/winutils/WinUtils.cpp b/src/gui/osutils/winutils/WinUtils.cpp
index 44f77043e..385a9389a 100644
--- a/src/gui/osutils/winutils/WinUtils.cpp
+++ b/src/gui/osutils/winutils/WinUtils.cpp
@@ -18,6 +18,7 @@
 #include "WinUtils.h"
 #include <QAbstractNativeEventFilter>
 #include <QApplication>
+#include <QDir>
 #include <QSettings>
 
 #include <windows.h>
@@ -88,14 +89,13 @@ bool WinUtils::isLaunchAtStartupEnabled() const
 {
     return QSettings(R"(HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run)", QSettings::NativeFormat)
         .contains(qAppName());
-    ;
 }
 
 void WinUtils::setLaunchAtStartup(bool enable)
 {
     QSettings reg(R"(HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run)", QSettings::NativeFormat);
     if (enable) {
-        reg.setValue(qAppName(), QApplication::applicationFilePath());
+        reg.setValue(qAppName(), QString("\"%1\"").arg(QDir::toNativeSeparators(QApplication::applicationFilePath())));
     } else {
         reg.remove(qAppName());
     }