From 075f19268c0440e8869a6eeb1605e2641a795504 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 16 Nov 2017 01:56:50 +0100 Subject: [PATCH] Ref T192, fixed parsing of DBus string --- src/blackmisc/dbusserver.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp index bedcd5095..c9f4669e3 100644 --- a/src/blackmisc/dbusserver.cpp +++ b/src/blackmisc/dbusserver.cpp @@ -104,14 +104,17 @@ namespace BlackMisc const QStringList parts(address.split(',')); for (const QString &part : parts) { - if (part.startsWith("host=")) + // "host=" or "tcp:host=" + if (part.contains("host=", Qt::CaseInsensitive)) { - host = part.midRef(part.lastIndexOf("=") + 1).trimmed().toString(); + const QString h = part.mid(part.lastIndexOf("=") + 1).trimmed(); + host = h; } - else if (part.startsWith("port=")) + else if (part.contains("port=", Qt::CaseInsensitive)) { + const QString p = part.mid(part.lastIndexOf("=") + 1).trimmed(); bool ok; - port = part.midRef(part.lastIndexOf("=") + 1).trimmed().toInt(&ok); + port = p.toInt(&ok); if (! ok) { port = -1; } } }