Fix potential race condition
This commit is contained in:
parent
e765fa5d12
commit
621ae3e007
2 changed files with 3 additions and 0 deletions
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue