diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-01-08 20:06:21 +0100 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-02-09 22:28:17 +0000 |
| commit | 66dbca1e06af0607a2d0fc6b8d14ef1ebb034f0a (patch) | |
| tree | a15713062e04f6c9dc50a2139e2192a9c3c89c3e /src/modules/bluetooth/module-bluetooth-device.c | |
| parent | 5e2a80c7e33a9f32058d53c33519197567a9887a (diff) | |
dbus: remove filter functions only if they were actually set before
This fixes an assert when destructing modules that have not been fully
initialized.
https://bugzilla.redhat.com/show_bug.cgi?id=548525
Diffstat (limited to 'src/modules/bluetooth/module-bluetooth-device.c')
| -rw-r--r-- | src/modules/bluetooth/module-bluetooth-device.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index 0ba1421b..19676dfa 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -179,6 +179,8 @@ struct userdata { int stream_write_type; int service_write_type, service_read_type; + + pa_bool_t filter_added; }; #define FIXED_LATENCY_PLAYBACK_A2DP (25*PA_USEC_PER_MSEC) @@ -2405,6 +2407,7 @@ int pa__init(pa_module* m) { pa_log_error("Failed to add filter function"); goto fail; } + u->filter_added = TRUE; speaker = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='SpeakerGainChanged',path='%s'", u->path); mike = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='MicrophoneGainChanged',path='%s'", u->path); @@ -2494,7 +2497,9 @@ void pa__done(pa_module *m) { pa_xfree(mike); } - dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + if (u->filter_added) + dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + pa_dbus_connection_unref(u->connection); } |