diff options
| author | Juan Linietsky | 2016-07-08 11:26:48 -0300 |
|---|---|---|
| committer | Rémi Verschelde | 2016-07-08 19:28:54 +0200 |
| commit | 6e7db99614f6f15bbf925c738de5e124b767c9b2 (patch) | |
| tree | fef9fed2d653434cf6e0ba185f80d01b91ce0646 /platform/x11/os_x11.cpp | |
| parent | 3963f89ebdb034a7f81eea19f88570324f8e852d (diff) | |
| download | godot-6e7db99614f6f15bbf925c738de5e124b767c9b2.tar.gz godot-6e7db99614f6f15bbf925c738de5e124b767c9b2.tar.zst godot-6e7db99614f6f15bbf925c738de5e124b767c9b2.zip | |
Avoid crash if setting modifiers fails, closes #5158
(cherry picked from commit 7e3044981ef3ed2a71270e331f2a36f57d5ec0c5)
Diffstat (limited to '')
| -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 279488e6e..4cd750088 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); |