Fix possible defect which seems to intend swapping variables

Change-Id: Iaf5d956e37ff9fe764c8f3f0c2a64b88d532c4fb

diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp
index 8575368..9b8142b 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_context.cpp
+++ b/ism/extras/efl_immodule/isf_imf_context.cpp
@@ -1216,7 +1216,7 @@ isf_imf_context_del (Ecore_IMF_Context *ctx)
         _focused_ic = context_scim;
         if(context_scim->impl->si && context_scim->impl->si->get_frontend_data() == context_scim)
             context_scim->impl->si->set_frontend_data (NULL);
-        _focused_ic = old_focused;
+        context_scim = old_focused;
 
         if (context_scim == _focused_ic) {
             _panel_client.turn_off (context_scim->id);

diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
index 49e7d0d..5d54433 100644 (file)
--- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
@@ -1303,7 +1303,7 @@ isf_wsc_context_del (WSCContextISF *wsc_ctx)
         // we need set the focused_ic to this context temporary.
         WSCContextISF* old_focused = _focused_ic;
         _focused_ic = context_scim;
-        _focused_ic = old_focused;
+        context_scim = old_focused;
 
         if (context_scim == _focused_ic) {
             g_info_manager->socket_turn_off ();