summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-05 01:10:20 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-12-06 02:18:17 +0100
commitc7b86cd7b397114a4873479b77f47cfaa0bb6cdb (patch)
treeede2e9e66a05853e36ee6340d57db7bf5b455ca9
parent8d4d48cef58e89dba59b4df55a65325727368a65 (diff)
downloaddbus-1-tqt-c7b86cd7b397114a4873479b77f47cfaa0bb6cdb.tar.gz
dbus-1-tqt-c7b86cd7b397114a4873479b77f47cfaa0bb6cdb.zip
Fix crash on hibernate
(cherry picked from commit 15cf9762c93d47d83591a20b32d5a4658023bcaa)
-rw-r--r--tqdbusconnection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tqdbusconnection.cpp b/tqdbusconnection.cpp
index 5c011e0..3895214 100644
--- a/tqdbusconnection.cpp
+++ b/tqdbusconnection.cpp
@@ -296,7 +296,7 @@ TQT_DBusMessage TQT_DBusConnection::sendWithReply(const TQT_DBusMessage &message
// and the dbus_error_is_set() check cannot be moved inside fromDBusMessage() without breaking the API and ABI.
if (!dbus_error_is_set(&d->error)) {
ret.d->error = TQT_DBusError();
- *error = TQT_DBusError();
+ if (error) *error = TQT_DBusError();
}
return ret;