summaryrefslogtreecommitdiff
path: root/ism/modules
diff options
context:
space:
mode:
authorInHong Han <inhong1.han@samsung.com>2018-01-05 10:57:50 +0900
committerInHong Han <inhong1.han@samsung.com>2018-01-05 02:03:33 +0000
commit850a2607369a166b803c47a8ef70b7c928e71384 (patch)
tree9c8b19c247277407e4eb8f7315df62f6dc6b6a92 /ism/modules
parentaf480b7b72002e798d42aa5f1871357ed03aafb7 (diff)
downloadisf-850a2607369a166b803c47a8ef70b7c928e71384.tar.gz
isf-850a2607369a166b803c47a8ef70b7c928e71384.tar.bz2
isf-850a2607369a166b803c47a8ef70b7c928e71384.zip
Fix isf-panel-efl crash issue when the ecore_wl_init() is failed
Change-Id: I22fcbd035af031c754adaba6d80c3788f67bc8ea
Diffstat (limited to 'ism/modules')
-rw-r--r--ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
index 454fdfa1..e1d64185 100644
--- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
@@ -1181,10 +1181,14 @@ isf_wsc_context_init (void)
if (!_scim_initialized) {
_ecore_wl_init_count = ecore_wl_init (NULL);
- initialize ();
- _scim_initialized = true;
- isf_wsc_input_panel_init ();
- //isf_wsc_context_set_hardware_keyboard_mode(context_scim);
+ if (_ecore_wl_init_count > 0) {
+ initialize ();
+ _scim_initialized = true;
+ isf_wsc_input_panel_init ();
+ //isf_wsc_context_set_hardware_keyboard_mode(context_scim);
+ }
+ else
+ LOGE("Failed to initialize Ecore_Wl");
}
}