diff options
| author | Daniele E. Domenichelli <daniele.domenichelli@gmail.com> | 2011-04-18 16:21:07 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-18 16:25:00 (GMT) |
| commit | fdf12afc9aaa1432f24817229863baaa68ec13ab (patch) | |
| tree | 16df3689fa77f4aa864851c51ed9570a8d45c6c9 /src/dbus/qdbusintegrator.cpp | |
| parent | bc0bf6f84034267d1e15ca9ca31e6498e6d97bd3 (diff) | |
| download | Qt-fdf12afc9aaa1432f24817229863baaa68ec13ab.zip Qt-fdf12afc9aaa1432f24817229863baaa68ec13ab.tar.gz Qt-fdf12afc9aaa1432f24817229863baaa68ec13ab.tar.bz2 | |
QtDBus: Fix empty service name in peer-to-peer connections
Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 10f749b..269e885 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -2390,7 +2390,7 @@ void QDBusConnectionPrivate::unregisterServiceNoLock(const QString &serviceName) bool QDBusConnectionPrivate::isServiceRegisteredByThread(const QString &serviceName) const { - if (serviceName == baseService) + if (!serviceName.isEmpty() && serviceName == baseService) return true; QStringList copy = serviceNames; return copy.contains(serviceName); |