From 45f37c508ccde13f278805546a991dca02a162ec Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Tue, 18 Oct 2016 14:56:48 +0100
Subject: [PATCH 1/3] #5657 Make serial key argument for server only

---
 src/gui/src/MainWindow.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 417fcb9f..4866ec26 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -554,10 +554,6 @@ void MainWindow::startSynergy()
 
 	args << "--name" << getScreenName();
 
-	if (!appConfig().serialKey().isEmpty()) {
-		args << "--serial-key" << appConfig().serialKey();
-	}
-
 	if (desktopMode)
 	{
 		setSynergyProcess(new QProcess(this));
@@ -787,6 +783,10 @@ bool MainWindow::serverArgs(QStringList& args, QString& app)
 #endif
 	args << "-c" << configFilename << "--address" << address();
 
+	if (!appConfig().serialKey().isEmpty()) {
+		args << "--serial-key" << appConfig().serialKey();
+	}
+
 #if defined(Q_OS_WIN)
 	// pass in physical resolution and primary screen center
 	// TODO: get this information in the core binary even when

From 880864a249d1b482f6880d0b35c49ecb71636f27 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Tue, 18 Oct 2016 14:57:34 +0100
Subject: [PATCH 2/3] Version to 1.8.5-rc1

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc5a3311..6d3bf196 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,8 @@
 # Version number for Synergy
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 8)
-set(VERSION_REV 4)
-set(VERSION_STAGE stable)
+set(VERSION_REV 5)
+set(VERSION_STAGE rc1)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}")
 
 cmake_minimum_required(VERSION 2.6)

From dfc7c31d67abfd2217c266a6ef693b41f29982e2 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Tue, 18 Oct 2016 15:43:15 +0100
Subject: [PATCH 3/3] #5657 Delay auto client adding while activation dialog is
 shown

---
 src/gui/src/MainWindow.cpp | 29 ++++++++++++++++++++++++++++-
 src/gui/src/MainWindow.h   |  3 +++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 4866ec26..b5a44569 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -101,7 +101,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig,
 	m_BonjourInstall(NULL),
 	m_SuppressEmptyServerWarning(false),
 	m_ExpectedRunningState(kStopped),
-	m_pSslCertificate(NULL)
+	m_pSslCertificate(NULL),
+	m_ActivationDialogRunning(false)
 {
 	setupUi(this);
 
@@ -1167,6 +1168,14 @@ void MainWindow::on_m_pActionSettings_triggered()
 void MainWindow::autoAddScreen(const QString name)
 {
 	if (!m_ServerConfig.ignoreAutoConfigClient()) {
+		if (m_ActivationDialogRunning) {
+			// TODO: refactor this code
+			// add this screen to the pending list and check this list until
+			// users finish activation dialog
+			m_PendingClientNames.append(name);
+			return;
+		}
+
 		int r = m_ServerConfig.autoAddScreen(name);
 		if (r != kAutoAddScreenOk) {
 			switch (r) {
@@ -1205,6 +1214,9 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
 void MainWindow::on_m_pActivate_triggered()
 {
 	ActivationDialog activationDialog(this, appConfig(), licenseManager());
+	m_ActivationDialogRunning = true;
+	connect (&activationDialog, SIGNAL(finished(int)),
+			 this, SLOT(on_activationDialogFinish()), Qt::QueuedConnection);
 	activationDialog.exec();
 }
 
@@ -1424,10 +1436,25 @@ void MainWindow::on_windowShown()
 {
 	if (!m_AppConfig->activationHasRun() && (m_AppConfig->edition() == kUnregistered)) {
 		ActivationDialog activationDialog (this, appConfig(), licenseManager());
+		m_ActivationDialogRunning = true;
+		connect (&activationDialog, SIGNAL(finished(int)),
+				 this, SLOT(on_activationDialogFinish()), Qt::QueuedConnection);
 		activationDialog.exec();
 	}
 }
 
+void MainWindow::on_activationDialogFinish()
+{
+	m_ActivationDialogRunning = false;
+	if (!m_PendingClientNames.empty()) {
+		foreach (const QString& name, m_PendingClientNames) {
+			autoAddScreen(name);
+		}
+
+		m_PendingClientNames.clear();
+	}
+}
+
 QString MainWindow::getProfileRootForArg()
 {
 	CoreInterface coreInterface;
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index b7fc2ca5..632abec2 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -221,6 +221,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		qRuningState m_ExpectedRunningState;
 		QMutex m_StopDesktopMutex;
 		SslCertificate* m_pSslCertificate;
+		bool m_ActivationDialogRunning;
+		QStringList m_PendingClientNames;
 
 private slots:
 	void on_m_pCheckBoxAutoConfig_toggled(bool checked);
@@ -228,6 +230,7 @@ private slots:
 	void on_m_pButtonApply_clicked();
 	void installBonjour();
 	void on_windowShown();
+	void on_activationDialogFinish();
 
 signals:
 	void windowShown();