From 95c64f1404de66bbcc135d71118679205c97e7c6 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 18 Jul 2017 06:06:57 +0000 Subject: [PATCH] Revert "Fix possible defect which seems to intend swapping variables" This reverts commit 8490141313501a975e532897bda6efe4fc357283. Change-Id: I73f9a98206da1f32a3d344d39a637c2dec118da2 --- ism/extras/efl_immodule/isf_imf_context.cpp | 2 +- ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp index 4bf13d5..81991df 100644 --- 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); - context_scim = old_focused; + _focused_ic = 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 241d654..8beb42e 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -1305,7 +1305,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; - context_scim = old_focused; + _focused_ic = old_focused; if (context_scim == _focused_ic) { g_info_manager->socket_turn_off (); -- 2.7.4