discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c9e168460ebc5f2f5fa11d5af8cc7e2620663acd

commit c9e168460ebc5f2f5fa11d5af8cc7e2620663acd
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Apr 11 14:53:52 2016 -0400

    ensure that wl keymap is initialized, even if no configuration exists
    
    fixes no-config crash
    
    ref 62440eb5fe519f8d929c85d5f633f06914721ff4
---
 src/bin/e_comp_wl_input.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index d3ae0c2..2eea057 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -455,7 +455,10 @@ e_comp_wl_input_init(void)
 
    _xkb_keymap_key_by_name = dlsym(NULL, "xkb_keymap_key_by_name");
 
-    _e_comp_wl_input_context_keymap_set(cached_keymap, cached_context);
+    if (cached_keymap)
+      _e_comp_wl_input_context_keymap_set(cached_keymap, cached_context);
+    else
+      e_comp_wl_input_keymap_set(NULL, NULL, NULL, NULL, NULL);
 
    return EINA_TRUE;
 }

-- 


Reply via email to