From 3723d115a6f4d30f652957d131c2a6ea56ad1dd0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 24 Apr 2012 22:06:24 +0000 Subject: Fix crashes when wrapper widget is destroyed by toolkit before suil cleanup function is called. git-svn-id: http://svn.drobilla.net/lad/trunk/suil@4264 a436a847-0d15-0410-975c-d299462d15a1 --- src/instance.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/instance.c') diff --git a/src/instance.c b/src/instance.c index f6824e8..57cb7e1 100644 --- a/src/instance.c +++ b/src/instance.c @@ -257,13 +257,16 @@ suil_instance_free(SuilInstance* instance) } free(instance->features); - if (instance->wrapper) { - instance->wrapper->free(instance->wrapper); - dlclose(instance->wrapper->lib); - } if (instance->handle) { instance->descriptor->cleanup(instance->handle); } + if (instance->wrapper) { + if (instance->wrapper->free) { + instance->wrapper->free(instance->wrapper); + } + dlclose(instance->wrapper->lib); + free(instance->wrapper); + } dlclose(instance->lib_handle); free(instance); } -- cgit v1.2.1