Fix deallocation issue when multiple threads accessed resources

Signed-off-by: Jacki <jacki@thejackimonster.de>

1 files changed, 13 insertions, 7 deletions

diff --git a/src/ui/chat.c b/src/ui/chat.c
index 177d61c..0cd85da 100644
--- a/src/ui/chat.c
+++ b/src/ui/chat.c
@@ -2036,11 +2036,10 @@ iterate_ui_chat_update_context_media(void *cls,
   );
 
   g_object_set_qdata(G_OBJECT(child), closure->app->quarks.data, file);
-  g_object_set_qdata_full(
+  g_object_set_qdata(
     G_OBJECT(child),
     closure->app->quarks.ui,
-    handle,
-    (GDestroyNotify) ui_media_preview_delete
+    handle
   );
 
   gtk_widget_set_size_request(GTK_WIDGET(child), 80, 80);
@@ -2065,6 +2064,13 @@ _chat_update_media(UI_CHAT_Handle *handle,
     GtkWidget *widget = GTK_WIDGET(item->data);
     item = item->next;
 
+    UI_MEDIA_PREVIEW_Handle *media = g_object_get_qdata(
+      G_OBJECT(widget),
+      app->quarks.ui
+    );
+
+    ui_media_preview_delete(media);
+
     gtk_container_remove(
       GTK_CONTAINER(handle->chat_media_flowbox),
       widget
@@ -2289,12 +2295,12 @@ ui_chat_delete(UI_CHAT_Handle *handle)
 
   ui_picker_delete(handle->picker);
 
-  if (handle->loads)
-    g_list_free_full(handle->loads, (GDestroyNotify) ui_file_load_entry_delete);
-
   _chat_update_contacts(handle, handle->app, NULL);
-  _chat_update_files(handle, handle->app, NULL);
   _chat_update_media(handle, handle->app, NULL);
+  _chat_update_files(handle, handle->app, NULL);
+
+  if (handle->loads)
+    g_list_free_full(handle->loads, (GDestroyNotify) ui_file_load_entry_delete);
 
   g_object_unref(handle->builder);