global.cpp: Ensure qApp does not emit signal because of local QEventLoop

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index 8babbbddc05fae6e03b1d0437dc51aceb912a4d6..c68b2d2d091a9f836f418c153fcb126c080d5773 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -16,7 +16,7 @@
 #include <KIO/ApplicationLauncherJob>
 #include <KService>
 #include <KWindowSystem>
-#ifdef HAVE_KACTIVITIES
+#if HAVE_KACTIVITIES
 #include <KActivities/Consumer>
 #endif
 
@@ -143,11 +143,13 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl> &inputUrls,
 
 QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Dolphin::dolphinGuiInstances(const QString &preferredService)
 {
-#ifdef HAVE_KACTIVITIES
+#if HAVE_KACTIVITIES
     static std::once_flag one_consumer;
     static KActivities::Consumer *consumer;
     std::call_once(one_consumer, []() {
         consumer = new KActivities::Consumer();
+        // to prevent QGuiApplication::saveStateRequest
+        const QSignalBlocker blocker(qApp);
         // ensures the consumer is ready for query
         QEventLoop loop;
         QObject::connect(consumer, &KActivities::Consumer::serviceStatusChanged, &loop, &QEventLoop::quit);
@@ -161,7 +163,7 @@ QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Do
         QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
             new OrgKdeDolphinMainWindowInterface(service, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
         if (interface->isValid() && !interface->lastError().isValid()) {
-#ifdef HAVE_KACTIVITIES
+#if HAVE_KACTIVITIES
             const auto currentActivity = consumer->currentActivity();
             if (currentActivity.isEmpty() || currentActivity == QStringLiteral("00000000-0000-0000-0000-000000000000")
                 || interface->isOnActivity(consumer->currentActivity()))