From ffbe5107e223de7de853bd65d8cc384903120b2a Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 6 Mar 2021 14:59:55 +0300
Subject: [PATCH] Secondary instance fix

---
 client/main.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/main.cpp b/client/main.cpp
index f08e66d4..4f93c90a 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -3,6 +3,7 @@
 #include <QCommandLineParser>
 #include <QMessageBox>
 #include <QTranslator>
+#include <QTimer>
 
 #include "debug.h"
 #include "defines.h"
@@ -30,8 +31,14 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(ASFW_ANY);
 #endif
 
-    SingleApplication app(argc, argv);
+    SingleApplication app(argc, argv, true, SingleApplication::Mode::User | SingleApplication::Mode::SecondaryNotification);
 
+    if (!app.isPrimary()) {
+        QTimer::singleShot(1000, &app, [&](){
+            app.quit();
+        });
+        return app.exec();
+    }
 #ifdef Q_OS_WIN
     AllowSetForegroundWindow(0);
 #endif
@@ -73,7 +80,9 @@ int main(int argc, char *argv[])
 
     if (app.isPrimary()) {
         QObject::connect(&app, &SingleApplication::instanceStarted, &mainWindow, [&](){
+            qDebug() << "Secondary instance started, showing this window instead";
             mainWindow.show();
+            mainWindow.showNormal();
             mainWindow.raise();
         });
     }