From 6e7db99614f6f15bbf925c738de5e124b767c9b2 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 8 Jul 2016 11:26:48 -0300 Subject: [PATCH] Avoid crash if setting modifiers fails, closes #5158 (cherry picked from commit 7e3044981ef3ed2a71270e331f2a36f57d5ec0c5) --- platform/x11/os_x11.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 279488e6e86..4cd7500884c 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -114,7 +114,9 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi x11_display = XOpenDisplay(NULL); char * modifiers = XSetLocaleModifiers ("@im=none"); - ERR_FAIL_COND( modifiers == NULL ); + if (modifiers==NULL) { + WARN_PRINT("Error setting locale modifiers"); + } xim = XOpenIM (x11_display, NULL, NULL, NULL);