minor gtkui memleak fix

2 files changed, 12 insertions, 4 deletions

diff --git a/plugins.c b/plugins.c
index 384c3d71..a23478a5 100644
--- a/plugins.c
+++ b/plugins.c
@@ -985,11 +985,9 @@ plug_unload_all (void) {
     trace ("stopped all plugins\n");
     while (plugins) {
         plugin_t *next = plugins->next;
-#ifndef ANDROID
         if (plugins->handle) {
             dlclose (plugins->handle);
         }
-#endif
         free (plugins);
         plugins = next;
     }
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index ba84d0a7..62c0b8fd 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -1112,8 +1112,18 @@ gtkui_thread (void *ctx) {
     progress_destroy ();
     gtkui_hide_status_icon ();
     draw_free ();
-    gtk_widget_destroy (mainwin);
-    gtk_widget_destroy (searchwin);
+    if (theme_treeview) {
+        gtk_widget_destroy (theme_treeview);
+        theme_treeview = NULL;
+    }
+    if (mainwin) {
+        gtk_widget_destroy (mainwin);
+        mainwin = NULL;
+    }
+    if (searchwin) {
+        gtk_widget_destroy (searchwin);
+        searchwin = NULL;
+    }
     gdk_threads_leave ();
 }