summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2006-11-07 15:48:05 -0800
committerEric Anholt <eric@anholt.net>2006-11-07 15:48:29 -0800
commit5a40448f2d0ac2c86c617bebe3fb649174bf0d7f (patch)
tree2c8638c26cf52a8ba59dbe56bd146d49f7dbab06 /config
parent05f1c302460a14c8fa9a943a12d69adcd3c30d58 (diff)
A couple more cases of error message before freeing strings.
Diffstat (limited to 'config')
-rw-r--r--config/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.c b/config/config.c
index d59722245..b95128d81 100644
--- a/config/config.c
+++ b/config/config.c
@@ -274,23 +274,23 @@ configInitialise()
snprintf(busname, sizeof(busname), "org.x.config.display%d", atoi(display));
if (!dbus_bus_request_name(bus, busname, 0, &error) ||
dbus_error_is_set(&error)) {
- dbus_error_free(&error);
dbus_connection_unref(bus);
configfd = -1;
FatalError("[dbus] couldn't take over org.x.config: %s (%s)\n",
error.name, error.message);
+ dbus_error_free(&error);
return;
}
/* blocks until we get a reply. */
dbus_bus_add_match(bus, MATCH_RULE, &error);
if (dbus_error_is_set(&error)) {
- dbus_error_free(&error);
dbus_bus_release_name(bus, busname, &error);
dbus_connection_unref(bus);
configfd = -1;
FatalError("[dbus] couldn't match X.Org rule: %s (%s)\n", error.name,
error.message);
+ dbus_error_free(&error);
return;
}