summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTero Ahola <tero.ahola@digia.com>2012-02-08 07:50:40 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-05-03 15:21:41 (GMT)
commita03c9f329e86cace6557fc68dac8b89a15993ee4 (patch)
tree86549669407fe90e9a9c952df9c8486986468042
parentf668407b30868ef137016b70011ce888e7950d4e (diff)
downloadQt-a03c9f329e86cace6557fc68dac8b89a15993ee4.zip
Qt-a03c9f329e86cace6557fc68dac8b89a15993ee4.tar.gz
Qt-a03c9f329e86cace6557fc68dac8b89a15993ee4.tar.bz2
Fixed crash issue in QtDBus if D-Bus not installed
Task-number: QTBUG-23128 Change-Id: Iba47ddf2fbbfa56499c4c4e28899190f6b63efac Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/dbus/qdbusconnection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index b685a73..8c10e2b 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1111,7 +1111,7 @@ public:
if (!instance) {
qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.",
type == SessionBus ? "session" : type == SystemBus ? "system" : "generic");
- } else {
+ } else if (QDBusConnectionPrivate::d(*this)) {
QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
}
}