Merge pull request #56 from WayfireWM/fix-volume-dtor

ammen99 · web-flow · commit b348edc2ff0a · 2020-05-16T19:12:04.000+02:00
volume: Don't use object after unref
diff --git a/src/panel/widgets/volume.cpp b/src/panel/widgets/volume.cpp
@@ -290,10 +290,11 @@ WayfireVolume::~WayfireVolume()
 {
     disconnect_gvc_stream_signals();
 
-    gvc_mixer_control_close(gvc_control);
-    g_object_unref(gvc_control);
     if (notify_default_sink_changed)
         g_signal_handler_disconnect(gvc_control, notify_default_sink_changed);
 
+    gvc_mixer_control_close(gvc_control);
+    g_object_unref(gvc_control);
+
     popover_timeout.disconnect();
 }

Original file line number	Diff line number	Diff line change
`@@ -290,10 +290,11 @@ WayfireVolume::~WayfireVolume()`
`290`	`290`	`{`
`291`	`291`	`disconnect_gvc_stream_signals();`
`292`	`292`
`293`		`- gvc_mixer_control_close(gvc_control);`
`294`		`- g_object_unref(gvc_control);`
`295`	`293`	`if (notify_default_sink_changed)`
`296`	`294`	`g_signal_handler_disconnect(gvc_control, notify_default_sink_changed);`
`297`	`295`
	`296`	`+ gvc_mixer_control_close(gvc_control);`
	`297`	`+ g_object_unref(gvc_control);`
	`298`	`+`
`298`	`299`	`popover_timeout.disconnect();`
`299`	`300`	`}`