From: Shinwoo Kim Date: Mon, 6 Mar 2017 11:45:22 +0000 (+0900) Subject: Not init sub module if it is inited already. X-Git-Tag: submit/tizen/20170519.132143^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F117560%2F2;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-screen-reader.git Not init sub module if it is inited already. The screen-reader is enabled again without disabled, if the screen-reader is terminated abnormally, and launched again by at-spi-bus-launcher. Change-Id: Ic4f7ee446f741325c3e0073a17ebad0e609d1d8a --- diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 5635948..81806bd 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -204,10 +204,13 @@ _on_name_release_cb(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pe DEBUG("On_name_release_cb"); } +static Eina_Bool _submodules_inited = EINA_FALSE; static int _e_mod_submodules_init(void) { INFO("Init subsystems..."); + if (_submodules_inited) return 0; + _submodules_inited = EINA_TRUE; if (_e_mod_atspi_config_init()) goto fail; @@ -223,6 +226,7 @@ fail_gestures: _e_mod_atspi_config_shutdown(); fail: ERROR("Module initialization failed."); + _submodules_inited = EINA_FALSE; return -1; } @@ -230,6 +234,9 @@ static void _e_mod_submodules_shutdown(void) { INFO("Shutdown subsystems..."); + if (!_submodules_inited) return; + _submodules_inited = EINA_FALSE; + _atspi_gesture_shutdown(); g_gesture_navi = EINA_FALSE; _e_mod_atspi_config_save(); @@ -237,7 +244,6 @@ _e_mod_submodules_shutdown(void) _e_mod_atspi_gestures_shutdown(); } - static Eldbus_Message * _sc_enable(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg) {