From c7b86cd7b397114a4873479b77f47cfaa0bb6cdb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 5 Dec 2012 01:10:20 -0600 Subject: Fix crash on hibernate (cherry picked from commit 15cf9762c93d47d83591a20b32d5a4658023bcaa) --- tqdbusconnection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3