From 6b8c370a47642cc9ad870f860d5d5ff49288b489 Mon Sep 17 00:00:00 2001
From: Removed <removed@symless.com>
Date: Tue, 4 Oct 2016 11:48:47 +0100
Subject: [PATCH] #5629 Show the main window behind the activation dialog

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

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 87a79c51d4..f4cab6ef18 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -145,15 +145,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
 	}
 
 	updateLocalFingerprint();
-}
 
-void
-MainWindow::showEvent(QShowEvent* event) {
-	QMainWindow::showEvent (event);
-	if (!m_AppConfig.activationHasRun() && (m_AppConfig.edition() == Unregistered)) {
-		ActivationDialog activationDialog (this, m_AppConfig);
-		activationDialog.exec();
-	}
+	connect (this, SIGNAL(windowShown()), this, SLOT(on_windowShown()), Qt::QueuedConnection);
 }
 
 MainWindow::~MainWindow()
@@ -518,6 +511,12 @@ void MainWindow::proofreadInfo()
 	setSynergyState((qSynergyState)oldState);
 }
 
+void MainWindow::showEvent(QShowEvent* event)
+{
+	QMainWindow::showEvent(event);
+	emit windowShown();
+}
+
 void MainWindow::clearLog()
 {
 	m_pLogOutput->clear();
@@ -1367,6 +1366,14 @@ void MainWindow::bonjourInstallFinished()
 	m_pCheckBoxAutoConfig->setChecked(true);
 }
 
+void MainWindow::on_windowShown()
+{
+	if (!m_AppConfig.activationHasRun() && (m_AppConfig.edition() == Unregistered)) {
+		ActivationDialog activationDialog (this, m_AppConfig);
+		activationDialog.exec();
+	}
+}
+
 QString MainWindow::getProfileRootForArg()
 {
 	CoreInterface coreInterface;
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index d66201e361..b71d8a0032 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -117,6 +117,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		void serverDetected(const QString name);
 		void setEdition(int edition);
 		void updateLocalFingerprint();
+
 	public slots:
 		void appendLogRaw(const QString& text);
 		void appendLogInfo(const QString& text);
@@ -182,7 +183,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		void restartSynergy();
 		void proofreadInfo();
 
-		void showEvent(QShowEvent *event);
+		void showEvent (QShowEvent*);
+
 	private:
 		QSettings& m_Settings;
 		AppConfig& m_AppConfig;
@@ -217,6 +219,10 @@ private slots:
 	void on_m_pComboServerList_currentIndexChanged(QString );
 	void on_m_pButtonApply_clicked();
 	void installBonjour();
+	void on_windowShown();
+
+signals:
+	void windowShown();
 };
 
 #endif