Update to unsubscribe the gdbusconnection 69/169169/2 accepted/tizen/unified/20180206.164619 submit/tizen/20180206.021549
authorYoungHun Kim <yh8004.kim@samsung.com>
Sun, 4 Feb 2018 22:38:55 +0000 (07:38 +0900)
committerYoungHun Kim <yh8004.kim@samsung.com>
Sun, 4 Feb 2018 22:41:54 +0000 (07:41 +0900)
Change-Id: Iefa661d8d91a94170818cc6b722940044c1c143b

server/src/muse_server_system.c

index b2cb7ea..924ea05 100644 (file)
@@ -41,6 +41,7 @@ static void _ms_system_unsubscribe_poweroff_state_change(void)
 {
        ms_system_t *system = ms_get_instance()->system;
        g_return_if_fail(system);
+       g_return_if_fail(system->connection);
 
        g_dbus_connection_signal_unsubscribe(system->connection, system->muse_poweroff_id);
 }
@@ -174,13 +175,13 @@ void ms_system_deinit(ms_system_t *system)
 {
        g_return_if_fail(system);
 
+       _ms_system_unsubscribe_poweroff_state_change();
+
        if (system->connection)
                g_object_unref(system->connection);
 
        g_mutex_clear(&system->lock);
 
-       _ms_system_unsubscribe_poweroff_state_change();
-
        g_hash_table_foreach_remove(system->platform_info_table, _ms_system_free_key, NULL);
        g_hash_table_destroy(system->platform_info_table);