diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2007-04-08 23:19:19 +0000 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2007-04-08 23:19:19 +0000 |
commit | 353376a06677af64fc6e81d3118adc2e059516b8 (patch) | |
tree | 04750057f8997acd704ba34dcb2843e170ce28b9 /audio/headset.c | |
parent | 7558cca5c0bd954dc3db559c0d58ae6e497b13c0 (diff) |
Fix some forgotton leftovers
Diffstat (limited to 'audio/headset.c')
-rw-r--r-- | audio/headset.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/audio/headset.c b/audio/headset.c index 9e303782..44a6ce03 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -112,7 +112,6 @@ struct manager { }; static DBusConnection *connection = NULL; -static GMainLoop *main_loop = NULL; struct manager *audio_manager_new(DBusConnection *conn); void audio_manager_free(struct manager *manager); @@ -1973,8 +1972,7 @@ int headset_init(DBusConnection *conn) if (!manager) { error("Failed to create an audio manager"); dbus_connection_unref(connection); - g_main_loop_unref(main_loop); - exit(1); + return -1; } audio_manager_create_headset_server(manager, 12); @@ -1985,7 +1983,10 @@ int headset_init(DBusConnection *conn) void headset_exit(void) { audio_manager_free(manager); + manager = NULL; dbus_connection_unref(connection); + + connection = NULL; } |