From 91f3f41490666a526ed78af744507d7ee1134323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Thu, 29 Feb 2024 23:51:22 +0100
Subject: [PATCH] mixer-control: Fix a few oversights with signal connections

We should disconnect the signal handlers in all cases when the sink and source
disappears or is replaced.
---
 gvc-mixer-control.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/gvc-mixer-control.c b/gvc-mixer-control.c
index 41251eb..5704270 100644
--- a/gvc-mixer-control.c
+++ b/gvc-mixer-control.c
@@ -963,6 +963,13 @@ _set_default_source (GvcMixerControl *control,
         guint new_id;
 
         if (stream == NULL) {
+                if (!control->priv->default_source_is_set)
+                        return;
+
+                g_signal_handlers_disconnect_by_func (gvc_mixer_control_get_default_source (control),
+                                                      on_default_source_port_notify,
+                                                      control);
+
                 control->priv->default_source_id = 0;
                 control->priv->default_source_is_set = FALSE;
                 g_signal_emit (control,
@@ -976,12 +983,6 @@ _set_default_source (GvcMixerControl *control,
 
         if (control->priv->default_source_id != new_id) {
                 GvcMixerUIDevice *input;
-                control->priv->default_source_id = new_id;
-                control->priv->default_source_is_set = TRUE;
-                g_signal_emit (control,
-                               signals[DEFAULT_SOURCE_CHANGED],
-                               0,
-                               new_id);
 
                 if (control->priv->default_source_is_set) {
                         g_signal_handlers_disconnect_by_func (gvc_mixer_control_get_default_source (control),
@@ -994,6 +995,13 @@ _set_default_source (GvcMixerControl *control,
                                   G_CALLBACK (on_default_source_port_notify),
                                   control);
 
+                control->priv->default_source_id = new_id;
+                control->priv->default_source_is_set = TRUE;
+                g_signal_emit (control,
+                               signals[DEFAULT_SOURCE_CHANGED],
+                               0,
+                               new_id);
+
                 input = gvc_mixer_control_lookup_device_from_stream (control, stream);
 
                 g_signal_emit (G_OBJECT (control),
@@ -1038,6 +1046,11 @@ _set_default_sink (GvcMixerControl *control,
                  * sink if it's already unset */
                 if (control->priv->default_sink_is_set == FALSE)
                         return;
+
+                g_signal_handlers_disconnect_by_func (gvc_mixer_control_get_default_sink (control),
+                                                      on_default_sink_port_notify,
+                                                      control);
+
                 control->priv->default_sink_id = 0;
                 control->priv->default_sink_is_set = FALSE;
                 g_signal_emit (control,