From ebba77fd33f4c9ab347fe72ff6f530eff08297b7 Mon Sep 17 00:00:00 2001
From: Xinyu Hou <xinyu@synergy-project.org>
Date: Tue, 2 Dec 2014 15:03:19 +0000
Subject: [PATCH] Suppressed empty server warning on startup #4240

---
 src/gui/src/MainWindow.cpp | 9 +++++++--
 src/gui/src/MainWindow.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 671ed604..9d3aebf9 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -88,7 +88,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
 	m_DownloadMessageBox(NULL),
 	m_pCancelButton(NULL),
 	m_SuppressAutoConfigWarning(false),
-	m_BonjourInstall(NULL)
+	m_BonjourInstall(NULL),
+	m_SuppressEmptyServerWarning(false)
 {
 	setupUi(this);
 
@@ -160,7 +161,9 @@ void MainWindow::open()
 	// auto hiding before the user has configured synergy (which of course
 	// confuses first time users, who think synergy has crashed).
 	if (appConfig().startedBefore() && appConfig().processMode() == Desktop) {
+		m_SuppressEmptyServerWarning = true;
 		startSynergy();
+		m_SuppressEmptyServerWarning = false;
 	}
 }
 
@@ -541,8 +544,10 @@ bool MainWindow::clientArgs(QStringList& args, QString& app)
 
 	if (m_pLineEditHostname->text().isEmpty()) {
 		show();
-		QMessageBox::warning(this, tr("Hostname is empty"),
+		if (!m_SuppressEmptyServerWarning) {
+			QMessageBox::warning(this, tr("Hostname is empty"),
 							 tr("Please fill in a hostname for the synergy client to connect to."));
+		}
 		return false;
 	}
 
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index e0d74244..bbc96c37 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -191,6 +191,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		QMutex m_Mutex;
 		bool m_SuppressAutoConfigWarning;
 		CommandProcess* m_BonjourInstall;
+		bool m_SuppressEmptyServerWarning;
 
 private slots:
 	void on_m_pCheckBoxAutoConfig_toggled(bool checked);