From 8c94568c310d536592c090f03e773aad3348c88a Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Thu, 10 Sep 2020 12:15:08 +0100
Subject: [PATCH 1/2] #6758 Added quotes round the tls path incase there are
 spaces.

---
 src/gui/src/MainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 4cc156abb..2bcf21776 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -670,7 +670,7 @@ void MainWindow::startSynergy()
 
     if (m_AppConfig->getCryptoEnabled()) {
         args << "--enable-crypto";
-        args << "--tls-cert" << m_AppConfig->getTLSCertPath();
+        args << "--tls-cert" <<  QString("\"%1\"").arg(m_AppConfig->getTLSCertPath());
     }
 
 #if defined(Q_OS_WIN)

From 6805841cac7076c8b1a433dfd1591a17daebc043 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Thu, 10 Sep 2020 12:16:16 +0100
Subject: [PATCH 2/2] #6758 Updated ChangeLog

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 81a0ca3c2..e4270bed7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ v1.12.x-snapshot
 ===========
 Bug fixes:
 - #6753 Fixed a number of vulnerabilities detected by static analysis
+- #6758 Account name with space on windows causes synergy to error when starting
 
 Enhancements:
 - #6750 Integrate SonarCloud for static analysis and test coverage