From 6b349bd0803be62c7780a0696f98b778f0c57d0a Mon Sep 17 00:00:00 2001
From: henkdegroot <13550012+henkdegroot@users.noreply.github.com>
Date: Fri, 21 May 2021 16:48:06 +0200
Subject: [PATCH 1/2] Add Single Click on Win OS Server System Tray Icon

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

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 2d71da7ab1..8919802dc0 100644
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -598,6 +598,14 @@ void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReaso
     {
         ShowWindowInForeground();
     }
+
+    // on single click on the icon, show window in fore ground for windows only
+#ifdef _WIN32
+    if ( ActReason == QSystemTrayIcon::Trigger )
+    {
+        ShowWindowInForeground();
+    }
+#endif
 }
 
 void CServerDlg::OnCLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString strVersion )
diff --git a/src/serverdlg.h b/src/serverdlg.h
index af88a9cc5c..00606c126f 100644
--- a/src/serverdlg.h
+++ b/src/serverdlg.h
@@ -73,6 +73,7 @@ class CServerDlg : public CBaseDlg, private Ui_CServerDlgBase
     {
         showNormal();
         raise();
+        activateWindow();
     }
     void ModifyAutoStartEntry ( const bool bDoAutoStart );
     void UpdateRecorderStatus ( QString sessionDir );

From 790cc98021ad0a030958a891e46539cd13d36a24 Mon Sep 17 00:00:00 2001
From: henkdegroot <13550012+henkdegroot@users.noreply.github.com>
Date: Sat, 22 May 2021 14:41:18 +0200
Subject: [PATCH 2/2] single and double combined for windows

---
 src/serverdlg.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 8919802dc0..faf4862e4d 100644
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -593,19 +593,16 @@ void CServerDlg::OnClearRecordingDirClicked()
 
 void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason )
 {
-    // on double click on the icon, show window in fore ground
+    #ifdef _WIN32
+    // on single or double click on the icon, show window in foreground for windows only
+    if ( ActReason == QSystemTrayIcon::Trigger || ActReason == QSystemTrayIcon::DoubleClick )
+    #else
+    // on double click on the icon, show window in foreground for all
     if ( ActReason == QSystemTrayIcon::DoubleClick )
+    #endif
     {
         ShowWindowInForeground();
     }
-
-    // on single click on the icon, show window in fore ground for windows only
-#ifdef _WIN32
-    if ( ActReason == QSystemTrayIcon::Trigger )
-    {
-        ShowWindowInForeground();
-    }
-#endif
 }
 
 void CServerDlg::OnCLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString strVersion )