e-comp-wl-input: destroy xkb keyboard state Before destroying the keymap

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-07-01 13:25:20 -04:00
parent a554a27bea
commit 0ae0559eba
1 changed files with 4 additions and 4 deletions

View File

@ -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);