From 55ea7625b310589aba0024d0b236e692a237c8dd Mon Sep 17 00:00:00 2001 From: Deve Date: Wed, 10 Jan 2018 22:05:27 +0100 Subject: [PATCH] Create xkb context before registry listener is created --- lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp index 0b44415e0..c8124adfa 100644 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp @@ -774,6 +774,8 @@ CIrrDeviceWayland::CIrrDeviceWayland(const SIrrlichtCreationParameters& params) m_display = wl_display_connect(NULL); + m_xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + m_registry = wl_display_get_registry(m_display); wl_registry_add_listener(m_registry, &WaylandCallbacks::registry_listener, this); @@ -781,8 +783,6 @@ CIrrDeviceWayland::CIrrDeviceWayland(const SIrrlichtCreationParameters& params) wl_display_dispatch(m_display); wl_display_roundtrip(m_display); - m_xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); - if (CreationParams.DriverType != video::EDT_NULL) { if (!createWindow())