Commit c2ad5129 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

install: fix wrong dbus connection shutdown

parent b5f776ce
...@@ -773,7 +773,7 @@ static char *get_config_path(void) { ...@@ -773,7 +773,7 @@ static char *get_config_path(void) {
} }
} }
static int do_run(void) { static int do_realize(void) {
DBusConnection *bus = NULL; DBusConnection *bus = NULL;
DBusError error; DBusError error;
int r, q; int r, q;
...@@ -827,8 +827,10 @@ static int do_run(void) { ...@@ -827,8 +827,10 @@ static int do_run(void) {
r = q; r = q;
finish: finish:
if (bus) if (bus) {
dbus_connection_close(bus);
dbus_connection_unref(bus); dbus_connection_unref(bus);
}
dbus_error_free(&error); dbus_error_free(&error);
...@@ -889,7 +891,7 @@ int main(int argc, char *argv[]) { ...@@ -889,7 +891,7 @@ int main(int argc, char *argv[]) {
} }
} }
if (do_run() < 0) if (do_realize() < 0)
goto finish; goto finish;
retval = arg_action == ACTION_TEST ? 1 : 0; retval = arg_action == ACTION_TEST ? 1 : 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment