X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/87f30d3fc8172649b3c905b04e20655ca18ac68f..29778152ad:/src/global.cpp diff --git a/src/global.cpp b/src/global.cpp index 64282e711..48e78e9ea 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -94,7 +94,7 @@ bool Dolphin::attachToExistingInstance(const QList& inputUrls, bool openFi // Don't match the service without trailing "-" (unique instance) const QString pattern = QStringLiteral("org.kde.dolphin-"); // Don't match the pid without leading "-" - const QString myPid = QStringLiteral("-") + QString::number(QCoreApplication::applicationPid()); + const QString myPid = QLatin1Char('-') + QString::number(QCoreApplication::applicationPid()); for (const QString& service : services) { if (service.startsWith(pattern) && !service.endsWith(myPid)) { // Check if instance can handle our URLs @@ -103,10 +103,9 @@ bool Dolphin::attachToExistingInstance(const QList& inputUrls, bool openFi QStringLiteral("/dolphin/Dolphin_1"), QStringLiteral("org.kde.dolphin.MainWindow")) ); - if (!instance->isValid() || instance->lastError().isValid()) { - continue; + if (instance->isValid() && !instance->lastError().isValid()) { + dolphinServices.append(qMakePair(instance, QStringList())); } - dolphinServices.append(qMakePair(instance, QStringList())); } }