summaryrefslogtreecommitdiff
path: root/backends/oss
diff options
context:
space:
mode:
authorMichal Ratajsky <[email protected]>2015-12-10 13:50:33 +0100
committerMichal Ratajsky <[email protected]>2015-12-10 13:50:33 +0100
commitb824b6aab1320762e6ffaaf2e8a12eb021762d98 (patch)
treeddd13d61ed623e44203bc94a28335a31e5e85b91 /backends/oss
parentd62f85c3dc4f8de5fe5a59908cef705b9d0a3440 (diff)
downloadlibmatemixer-b824b6aab1320762e6ffaaf2e8a12eb021762d98.tar.bz2
libmatemixer-b824b6aab1320762e6ffaaf2e8a12eb021762d98.tar.xz
alsa/oss: Correctly disconnect device signals
Diffstat (limited to 'backends/oss')
-rw-r--r--backends/oss/oss-backend.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/oss/oss-backend.c b/backends/oss/oss-backend.c
index eb4d742..70b32be 100644
--- a/backends/oss/oss-backend.c
+++ b/backends/oss/oss-backend.c
@@ -537,11 +537,11 @@ remove_device_by_list_item (OssBackend *oss, GList *item)
G_CALLBACK (remove_device),
oss);
+ /* May emit removed signals */
if (oss_device_is_open (device) == TRUE)
oss_device_close (device);
- g_signal_handlers_disconnect_by_func (G_OBJECT (device),
- G_CALLBACK (remove_stream),
+ g_signal_handlers_disconnect_by_data (G_OBJECT (device),
oss);
oss->priv->devices = g_list_delete_link (oss->priv->devices, item);
@@ -554,7 +554,7 @@ remove_device_by_list_item (OssBackend *oss, GList *item)
oss->priv->default_device = NULL;
}
- /* The list may and may not have been invalidate by device signals */
+ /* The list may have been invalidated by device signals */
free_stream_list (oss);
g_signal_emit_by_name (G_OBJECT (oss),