From 1df4bed1ecb94b3fbc9bab19aff5c4cefb1c4c69 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 15 Jun 2012 16:58:54 +0100 Subject: [PATCH] Reset inited variable on cleanup --- atk-adaptor/bridge.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index d776a4b..666b34c 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -56,6 +56,8 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data); SpiBridge *spi_global_app_data = NULL; +static gboolean inited = FALSE; + /*---------------------------------------------------------------------------*/ static void @@ -737,7 +739,6 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) GError *err = NULL; DBusError error; AtkObject *root; - static gboolean inited = FALSE; gboolean load_bridge; load_bridge = check_envvar (); @@ -882,6 +883,8 @@ atk_bridge_adaptor_cleanup (void) GList *l; GSList *ls; + g_return_if_fail (inited); + if (!spi_global_app_data) return; @@ -925,6 +928,8 @@ atk_bridge_adaptor_cleanup (void) g_free (spi_global_app_data); spi_global_app_data = NULL; + + inited = FALSE; } /*---------------------------------------------------------------------------*/ -- 2.7.4