diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-11 13:58:52 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-06 17:37:00 +0100 |
| commit | 624ee454ec58074c1156b8a82f48ba83279c44fa (patch) | |
| tree | bb613e72469feec84f80dc388674c1f764806021 /src/dbus/qdbusserver.cpp | |
| parent | aa83bacb14dac06eb7226c8c688f37eeecec15d4 (diff) | |
Make QDBusConnection and QDBusServer return an error on default objects
The error of "Not connected".
This incidentally solves a crash when QDBusServer().lastError() is
called but libdbus-1 couldn't be found.
Change-Id: Id93f447d00c0aa6660d4528c4bbce5998d9186a8
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/dbus/qdbusserver.cpp')
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 54b38ee848..b2c76a8750 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -129,7 +129,7 @@ bool QDBusServer::isConnected() const */ QDBusError QDBusServer::lastError() const { - return d->lastError; + return d ? d->lastError : QDBusError(QDBusError::Disconnected, QStringLiteral("Not connected.")); } /*! |