summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-01-25 13:54:47 +1030
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-01-29 09:13:25 +1030
commit7dde5a694a06efed0a9186f05d33f5be6f5dba71 (patch)
tree71b784b77de30e0b8a1e61c860755036b7809191
parentf0ba7707161b8866e6fde32d6f25be6afcdecb48 (diff)
config: check connection != NULL before getting dbus' dispatch status.
(cherry picked from commit d23266522390a4ef7203ae7c062b2b920e45f9d7)
-rw-r--r--config/dbus-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/dbus-core.c b/config/dbus-core.c
index 9cf153076..b349c6e3c 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -56,8 +56,9 @@ wakeup_handler(pointer data, int err, pointer read_mask)
if (info->connection && FD_ISSET(info->fd, (fd_set *) read_mask)) {
do {
dbus_connection_read_write_dispatch(info->connection, 0);
- } while (dbus_connection_get_dispatch_status(info->connection) ==
- DBUS_DISPATCH_DATA_REMAINS);
+ } while (info->connection &&
+ dbus_connection_get_is_connected(info->connection) &&
+ dbus_connection_get_dispatch_status(info->connection) == DBUS_DISPATCH_DATA_REMAINS);
}
}