X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3df68fb667a9d0df0bfe53ff762c88b9fcde28f6..69838a1cdd6a10d9d6ca6572962c438a97d46b36:/src/global.cpp diff --git a/src/global.cpp b/src/global.cpp index 12f86a2f3..3b81c536a 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -82,7 +82,7 @@ bool Dolphin::attachToExistingInstance(const QList& inputUrls, bool openFi QSharedPointer preferred( new QDBusInterface(preferredService, QStringLiteral("/dolphin/Dolphin_1"), - QStringLiteral("org.kde.dolphin.MainWindow")) + QString()) // #414402: use empty interface name to prevent QtDBus from caching the interface. ); if (preferred->isValid() && !preferred->lastError().isValid()) { dolphinServices.append(qMakePair(preferred, QStringList())); @@ -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