stream-chooser: Do a better job cleaning up toplevels and outputs

Author: soreau

src/stream-chooser/outputwidget.cpp

@@ -83,10 +83,7 @@ static void session_handle_done(void *data,
 
 static void session_handle_stopped(void*,
     struct ext_image_copy_capture_session_v1 *session)
-{
-    ext_image_copy_capture_session_v1_destroy(session);
-    session = NULL;
-}
+{}
 
 static const struct ext_image_copy_capture_session_v1_listener recording_session_listener = {
     .buffer_size   = session_handle_buffer_size,
@@ -297,6 +294,11 @@ WayfireChooserOutput::~WayfireChooserOutput()
         ext_image_copy_capture_session_v1_destroy(recording_session);
     }
 
+    if (buffer->buffer)
+    {
+        wl_buffer_destroy(buffer->buffer);
+    }
+
     if (buffer->bo)
     {
         gbm_bo_destroy(buffer->bo);

src/stream-chooser/stream-chooser.hpp

@@ -70,6 +70,8 @@ class WayfireStreamChooserApp : public Gtk::Application
     WayfireStreamChooserApp();
     ~WayfireStreamChooserApp()
     {
+        toplevels.clear();
+        outputs.clear();
         if (gbm_device_ptr)
         {
             gbm_device_destroy(gbm_device_ptr);

src/stream-chooser/toplevelwidget.cpp

@@ -94,10 +94,7 @@ static void session_handle_done(void *data,
 
 static void session_handle_stopped(void*,
     struct ext_image_copy_capture_session_v1 *session)
-{
-    ext_image_copy_capture_session_v1_destroy(session);
-    session = NULL;
-}
+{}
 
 static const struct ext_image_copy_capture_session_v1_listener recording_session_listener = {
     .buffer_size   = session_handle_buffer_size,
@@ -489,6 +486,11 @@ WayfireChooserTopLevel::~WayfireChooserTopLevel()
         ext_image_copy_capture_session_v1_destroy(recording_session);
     }
 
+    if (buffer->buffer)
+    {
+        wl_buffer_destroy(buffer->buffer);
+    }
+
     if (buffer->bo)
     {
         gbm_bo_destroy(buffer->bo);