fixed memory leak on reload

Author: AKArien

src/panel/widgets/wp-mixer/wf-wp-control.cpp

@@ -10,6 +10,17 @@ WfWpControl::WfWpControl(WpPipewireObject *obj, WayfireWpMixer *parent_widget)
     parent = parent_widget;
 }
 
+WfWpControl::~WfWpControl()
+{
+    mute_conn.disconnect();
+    middle_conn.disconnect();
+    right_conn.disconnect();
+    for (auto signal : signals)
+    {
+        signal.disconnect();
+    }
+}
+
 void WfWpControl::init()
 {
     guint32 id = wp_proxy_get_bound_id(WP_PROXY(object));
@@ -53,7 +64,7 @@ void WfWpControl::init()
 
     // setup user interactions
 
-    mute_conn = button.signal_toggled().connect(
+    signals.push_back(mute_conn = button.signal_toggled().connect(
         [this, id] ()
     {
         // if the menu was popped up because of an external change
@@ -63,7 +74,7 @@ void WfWpControl::init()
         // disregarding the return value prevents cases where ignore is read at an ncorrect time,
         // with the only problem of having one update ignored if something goes very wrong
         WpCommon::get().set_mute(id, button.get_active());
-    });
+    }));
 
     scale.set_user_changed_callback(
         [this, id] ()
@@ -74,7 +85,7 @@ void WfWpControl::init()
     });
 
     auto scroll_gesture = Gtk::EventControllerScroll::create();
-    scroll_gesture->signal_scroll().connect([=] (double dx, double dy)
+    signals.push_back(scroll_gesture->signal_scroll().connect([=] (double dx, double dy)
     {
         dy = parent->invert_scroll ? dy : dy * -1; // for the same scrolling as volume widget, which we will
                                                    // agree it is more intuitive for more people
@@ -92,7 +103,7 @@ void WfWpControl::init()
 
         WpCommon::get().set_volume(id, scale.get_target_value() + change);
         return true;
-    }, true);
+    }, true));
     scroll_gesture->set_flags(Gtk::EventControllerScroll::Flags::VERTICAL);
     add_controller(scroll_gesture);
 
@@ -200,6 +211,11 @@ std::unique_ptr<WfWpControl> WfWpControl::copy()
     return std::make_unique<WfWpControl>(object, parent);
 }
 
+WfWpControlDevice::~WfWpControlDevice()
+{
+    def_conn.disconnect();
+}
+
 void WfWpControlDevice::init()
 {
     default_btn.get_style_context()->add_class("wireplumber");

src/panel/widgets/wp-mixer/wf-wp-control.hpp

@@ -19,12 +19,14 @@ class WfWpControl : public Gtk::Grid
     WayfireWpMixer *parent;
     std::shared_ptr<Gtk::GestureClick> middle_click_mute, right_click_mute;
     sigc::connection middle_conn, right_conn;
+    std::vector<sigc::connection> signals;
     void update_gestures();
     virtual void update_icons_pos();
     WfOption<int> slider_length{"panel/wp_slider_length"};
 
   public:
     WfWpControl(WpPipewireObject *obj, WayfireWpMixer *parent_widget);
+    ~WfWpControl();
     virtual void init();
 
     WpPipewireObject *object;
@@ -49,13 +51,15 @@ class WfWpControl : public Gtk::Grid
 class WfWpControlDevice : public WfWpControl
 {
   private:
+
     sigc::connection def_conn;
     Gtk::Image is_def_icon;
     void update_icons_pos();
 
   public:
     WfWpControlDevice(WpPipewireObject *obj, WayfireWpMixer *parent_widget) : WfWpControl(obj, parent_widget)
     {}
+    ~WfWpControlDevice();
     void init();
 
     Gtk::ToggleButton default_btn;

src/panel/widgets/wp-mixer/wp-mixer.cpp

@@ -217,7 +217,7 @@ void WayfireWpMixer::init(Gtk::Box *container)
 
     // scroll to change volume of the object targetted by the quick_target widget
     auto scroll_gesture = Gtk::EventControllerScroll::create();
-    scroll_gesture->signal_scroll().connect([=] (double dx, double dy)
+    scroll_conn = scroll_gesture->signal_scroll().connect([=] (double dx, double dy)
     {
         if (!quick_target)
         {
@@ -345,4 +345,9 @@ WayfireWpMixer::~WayfireWpMixer()
     WpCommon::get().rem_widget(this);
     gtk_widget_unparent(GTK_WIDGET(popover->gobj()));
     popover_timeout.disconnect();
+    volume_changed_signal.disconnect();
+    left_conn.disconnect();
+    middle_conn.disconnect();
+    right_conn.disconnect();
+    scroll_conn.disconnect();
 }

src/panel/widgets/wp-mixer/wp-mixer.hpp

@@ -38,10 +38,8 @@ class WayfireWpMixer : public WayfireWidget
     gulong notify_volume_signal   = 0;
     gulong notify_is_muted_signal = 0;
     gulong notify_default_sink_changed = 0;
-    sigc::connection popover_timeout;
-    sigc::connection volume_changed_signal;
+    sigc::connection popover_timeout, volume_changed_signal, left_conn, middle_conn, right_conn, scroll_conn;
     std::shared_ptr<Gtk::GestureClick> left_click_gesture, middle_click_gesture, right_click_gesture;
-    sigc::connection left_conn, middle_conn, right_conn;
 
     // widgets for the mixer itself
     Gtk::Label output_label, input_label, streams_label;

src/util/animated-scale.cpp

@@ -13,6 +13,11 @@ WayfireAnimatedScale::WayfireAnimatedScale()
     });
 }
 
+WayfireAnimatedScale::~WayfireAnimatedScale()
+{
+    value_changed.disconnect();
+}
+
 void WayfireAnimatedScale::set_target_value(double value)
 {
     this->current_volume.animate(value);

src/util/animated-scale.hpp

@@ -17,6 +17,7 @@ class WayfireAnimatedScale : public Gtk::Scale
 
   public:
     WayfireAnimatedScale();
+    ~WayfireAnimatedScale();
 
     /* Gets the current target value */
     double get_target_value() const;