summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-12-20 18:44:53 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-12-22 12:16:57 (GMT)
commitcafbb2943eea989b0eeadb0c54c151ad921691b9 (patch)
tree3e0bb1d09b0f38ad349e7f7528e93d988775b4dd
parent94f786b0cdb6b6572c99ee6ce954aab05d461e6a (diff)
downloadQt-cafbb2943eea989b0eeadb0c54c151ad921691b9.zip
Qt-cafbb2943eea989b0eeadb0c54c151ad921691b9.tar.gz
Qt-cafbb2943eea989b0eeadb0c54c151ad921691b9.tar.bz2
Do not crash in case a future version of libdbus has a new kind of message.
-rw-r--r--src/dbus/qdbusintegrator.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 1842e5a..f64b7ca 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -565,10 +565,8 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
return true;
case QDBusMessage::ReplyMessage:
case QDBusMessage::ErrorMessage:
- return false; // we don't handle those here
case QDBusMessage::InvalidMessage:
- Q_ASSERT_X(false, "QDBusConnection", "Invalid message found when processing");
- break;
+ return false; // we don't handle those here
}
return false;