Fix potential race condition

samirgaire10 · Aug 6, 2023 · 621ae3e · 621ae3e
1 parent e765fa5
commit 621ae3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/core/dbushelper.cpp b/core/dbushelper.cpp
@@ -96,6 +96,7 @@ void DBusInstancePrivate::launchDBusDaemon()
     m_dbusProcess->setStandardOutputFile(KdeConnectConfig::instance().privateDBusAddressPath());
     m_dbusProcess->setStandardErrorFile(QProcess::nullDevice());
     m_dbusProcess->start();
+    m_dbusProcess->waitForStarted();    // Avoid potential racing condition
 
 #ifdef Q_OS_MAC
     // Set launchctl env

diff --git a/indicator/indicatorhelper_mac.cpp b/indicator/indicatorhelper_mac.cpp
@@ -112,6 +112,8 @@ int IndicatorHelper::daemonHook(QProcess &kdeconnectd)
                                        "KDE Connect will quit"),
                                   QMessageBox::Abort,
                                   QMessageBox::Abort);
+            // End the program
+            return -1;
         } else {
             // Show a warning and exit
             qCritical() << "Fail to get launchctl" << KDECONNECT_SESSION_DBUS_LAUNCHD_ENV << "env";