diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-07-08 11:26:48 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-07-08 11:28:09 -0300 |
commit | 7e3044981ef3ed2a71270e331f2a36f57d5ec0c5 (patch) | |
tree | 5a503a5df07a70a66b723c3fd48abfc5e5e6ae68 | |
parent | dc58be9f3542d640771722187959f56f042b5baa (diff) |
Avoid crash if setting modifiers fails, closes #5158
-rw-r--r-- | platform/x11/os_x11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 12957b81b7..846c61fd1f 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -116,7 +116,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"); + } const char* err; xrr_get_monitors = NULL; |