Modified not to restart IME when the EnableAutoRestartIse option is disabled

Change-Id: I90cd5e62e13bb53ed539d4c2957fca0b5fd538d6

diff --git a/ism/src/isf_info_manager.cpp b/ism/src/isf_info_manager.cpp
index 0c4320e..690f564 100644 (file)
--- a/ism/src/isf_info_manager.cpp
+++ b/ism/src/isf_info_manager.cpp
@@ -3008,7 +3008,6 @@ public:
             lock ();
             HelperInfoRepository::iterator hiit = m_helper_info_repository.find (client_id);
 
-            bool launch_ise_on_request = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_ISE_ON_REQUEST), false);
             bool enable_auto_restart = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_ENABLE_AUTO_RESTART_ISE), true);
             if (hiit != m_helper_info_repository.end ()) {
                 bool restart = false;
@@ -3027,7 +3026,7 @@ public:
 
                 m_signal_stop_default_ise (false);
 
-                if ((m_refocus_needed || m_reshow_needed || !launch_ise_on_request) && enable_auto_restart)
+                if (m_reshow_needed || enable_auto_restart)
                     m_restart_needed = true;
 
                 if (restart && !m_ise_exiting && m_restart_needed) {
@@ -3071,7 +3070,7 @@ public:
             }
 
             m_ise_exiting = false;
-            m_restart_needed = launch_ise_on_request ? false : true;
+            m_restart_needed = false;
             unlock ();
             socket_transaction_start ();
             m_signal_remove_helper (client_id);