From 916e53c260b19c9348a601915d70f0612186d9d1 Mon Sep 17 00:00:00 2001
From: Vladimir Golovnev <glassez@yandex.ru>
Date: Tue, 9 Aug 2022 19:12:12 +0300
Subject: [PATCH] Show progress dialog on second instance run

PR #17516.
---
 src/app/application.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/app/application.cpp b/src/app/application.cpp
index d49086009..67cdd58f3 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -339,7 +339,22 @@ void Application::processMessage(const QString &message)
 #ifndef DISABLE_GUI
     if (message.isEmpty())
     {
-        m_window->activate(); // show UI
+        // TODO: use [[likely]] in C++20
+        if (Q_LIKELY(BitTorrent::Session::instance()->isRestored()))
+        {
+            m_window->activate(); // show UI
+        }
+        else if (m_startupProgressDialog)
+        {
+            m_startupProgressDialog->show();
+            m_startupProgressDialog->activateWindow();
+            m_startupProgressDialog->raise();
+        }
+        else
+        {
+            createStartupProgressDialog();
+        }
+
         return;
     }
 #endif
@@ -703,11 +718,7 @@ try
     }
     else
     {
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         connect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);
-#else
-        connect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog, Qt::SingleShotConnection);
-#endif
     }
 #endif
     connect(BitTorrent::Session::instance(), &BitTorrent::Session::restored, this, [this]()
@@ -840,10 +851,10 @@ bool Application::isRunning()
 #ifndef DISABLE_GUI
 void Application::createStartupProgressDialog()
 {
+    Q_ASSERT(!m_startupProgressDialog);
     Q_ASSERT(m_desktopIntegration);
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+
     disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);
-#endif
 
     m_startupProgressDialog = new QProgressDialog(tr("Loading torrents..."), tr("Exit"), 0, 100);
     m_startupProgressDialog->setAttribute(Qt::WA_DeleteOnClose);