1 files changed, 15 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c
index 2dae72a2..278b5021 100755
--- a/src/main.c
+++ b/src/main.c
@@ -1360,15 +1360,6 @@ int main(int argc, char *argv[])
 
 	signal = setup_signalfd();
 
-#if defined TIZEN_EXT
-	if (access(CONTAINER_FILE, F_OK) == 0) {
-		g_main_loop_run(main_loop);
-
-		g_source_remove(signal);
-		return 0;
-	}
-#endif
-
 	dbus_error_init(&err);
 
 	conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, CONNMAN_SERVICE, &err);
@@ -1388,6 +1379,21 @@ int main(int argc, char *argv[])
 
 	__connman_dbus_init(conn);
 
+#if defined TIZEN_EXT
+	if (access(CONTAINER_FILE, F_OK) == 0) {
+		g_main_loop_run(main_loop);
+
+		g_source_remove(signal);
+		dbus_connection_unref(conn);
+		g_main_loop_unref(main_loop);
+
+		__connman_dbus_cleanup();
+		__connman_log_cleanup(option_backtrace);
+
+		return 0;
+	}
+#endif
+
 	if (!option_config)
 		config_init(CONFIGMAINFILE);
 	else