summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/instance.c11
-rw-r--r--src/x11_in_gtk2.c1
2 files changed, 8 insertions, 4 deletions
diff --git a/src/instance.c b/src/instance.c
index 57cb7e1..fcb7786 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -257,13 +257,18 @@ suil_instance_free(SuilInstance* instance)
}
free(instance->features);
+ // Call wrapper free function to destroy widgets and drop references
+ if (instance->wrapper && instance->wrapper->free) {
+ instance->wrapper->free(instance->wrapper);
+ }
+
+ // Call cleanup to destroy UI (if it still exists at this point)
if (instance->handle) {
instance->descriptor->cleanup(instance->handle);
}
+
+ // Close libraries and free everything
if (instance->wrapper) {
- if (instance->wrapper->free) {
- instance->wrapper->free(instance->wrapper);
- }
dlclose(instance->wrapper->lib);
free(instance->wrapper);
}
diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c
index e7b88ed..14b0ea2 100644
--- a/src/x11_in_gtk2.c
+++ b/src/x11_in_gtk2.c
@@ -129,7 +129,6 @@ wrapper_free(SuilWrapper* wrapper)
}
}
-
SUIL_API
SuilWrapper*
suil_wrapper_new(SuilHost* host,