[dbus] fix a wrong dbus destruct order that my cause deadlock on exit

lilydjwg · Feb 24, 2017 · addf6fd · addf6fd
1 parent dd30b92
commit addf6fd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/module/dbus/dbusstuff.c b/src/module/dbus/dbusstuff.c
@@ -397,6 +397,9 @@ void* DBusCreate(FcitxInstance* instance)
 
 void DBusDestroy(void* arg) {
     FcitxDBus* dbusmodule = (FcitxDBus*)arg;
+
+    fcitx_handler_table_free(dbusmodule->handler);
+
     if (dbusmodule->conn) {
         dbus_bus_release_name(dbusmodule->conn, dbusmodule->serviceName, NULL);
         dbus_connection_unref(dbusmodule->conn);
@@ -408,8 +411,6 @@ void DBusDestroy(void* arg) {
     DBusKill(&dbusmodule->daemon);
     free(dbusmodule->serviceName);
 
-    fcitx_handler_table_free(dbusmodule->handler);
-
     dbus_shutdown();
 
     free(dbusmodule);