From 1f41b92693f70c38b758dbab1734dc8fac5b224f Mon Sep 17 00:00:00 2001 From: Xinyu Hou Date: Mon, 5 Jan 2015 13:32:58 +0000 Subject: [PATCH] Fixed client detected dialog not shown when Synergy is minimized #4307 --- src/gui/src/ServerConfig.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp index 6b0a890e..693e26b8 100644 --- a/src/gui/src/ServerConfig.cpp +++ b/src/gui/src/ServerConfig.cpp @@ -374,13 +374,16 @@ int ServerConfig::showAddClientDialog(const QString& clientName) { int result = kAddClientIgnore; - if (m_pMainWindow->isActiveWindow()) { - AddClientDialog addClientDialog(clientName, m_pMainWindow); - addClientDialog.exec(); - result = addClientDialog.addResult(); - m_IgnoreAutoConfigClient = addClientDialog.ignoreAutoConfigClient(); + if (!m_pMainWindow->isActiveWindow()) { + m_pMainWindow->showNormal(); + m_pMainWindow->activateWindow(); } + AddClientDialog addClientDialog(clientName, m_pMainWindow); + addClientDialog.exec(); + result = addClientDialog.addResult(); + m_IgnoreAutoConfigClient = addClientDialog.ignoreAutoConfigClient(); + return result; }