devilhorns pushed a commit to branch master.

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

commit 0ae0559eba269c0474743971eb52b718a895f0af
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Wed Jul 1 13:25:20 2015 -0400

    e-comp-wl-input: destroy xkb keyboard state Before destroying the keymap
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/bin/e_comp_wl_input.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index b4e57b3..2e08418 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -453,10 +453,6 @@ e_comp_wl_input_shutdown(void)
    /* destroy e_comp->wl_comp_data->kbd.keys array */
    wl_array_release(&e_comp->wl_comp_data->kbd.keys);
 
-   /* unreference any existing keymap */
-   if (e_comp->wl_comp_data->xkb.keymap)
-     xkb_map_unref(e_comp->wl_comp_data->xkb.keymap);
-
    /* unmap any existing keyboard area */
    if (e_comp->wl_comp_data->xkb.area)
      munmap(e_comp->wl_comp_data->xkb.area, e_comp->wl_comp_data->xkb.size);
@@ -466,6 +462,10 @@ e_comp_wl_input_shutdown(void)
    if (e_comp->wl_comp_data->xkb.state)
      xkb_state_unref(e_comp->wl_comp_data->xkb.state);
 
+   /* unreference any existing keymap */
+   if (e_comp->wl_comp_data->xkb.keymap)
+     xkb_map_unref(e_comp->wl_comp_data->xkb.keymap);
+
    /* unreference any existing context */
    if (e_comp->wl_comp_data->xkb.context)
      xkb_context_unref(e_comp->wl_comp_data->xkb.context);

-- 


Reply via email to