From 8314e69d4f18c86a762f6ebdafa87b6deef0bb69 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Tue, 9 Aug 2016 17:28:11 +0900 Subject: [PATCH] Revert "[3.0]Change the location of checking NULL of mContext" This reverts commit c46805a3e33f6228d0869ca39e646a6d92040af8. Change-Id: I4644686a1378576482b9c3fc2210893ce9c61498 --- adaptors/wayland/input/seat.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adaptors/wayland/input/seat.cpp b/adaptors/wayland/input/seat.cpp index 0de5ad5..a8cab4f 100644 --- a/adaptors/wayland/input/seat.cpp +++ b/adaptors/wayland/input/seat.cpp @@ -224,12 +224,6 @@ void Seat::KeyboardKeymap( unsigned int format, int fd, unsigned int size ) mXkbData.mContext = xkb_context_new( XKB_CONTEXT_NO_FLAGS ); } - if( !mXkbData.mContext ) - { - DALI_LOG_ERROR("xkb_context_new failed"); - close(fd); - return; - } // current formats defined in wayland-client-protocol.h // WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP =0, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1=1 @@ -249,6 +243,12 @@ void Seat::KeyboardKeymap( unsigned int format, int fd, unsigned int size ) return; } + if( !mXkbData.mContext ) + { + DALI_LOG_ERROR("xkb_context_new failed"); + close(fd); + return; + } mXkbData.mKeymap = xkb_map_new_from_string(mXkbData.mContext, map, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS); munmap(map, size); -- 2.7.4