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] #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