godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid crash if setting modifiers fails, closes #5158 

(cherry picked from commit 7e3044981e)
This commit is contained in:
Juan Linietsky 2016-07-08 11:26:48 -03:00 committed by Rémi Verschelde
parent 3963f89ebd
commit 6e7db99614
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/x11/os_x11.cpp
View File

@ -114,7 +114,9 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
x11_display = XOpenDisplay(NULL); x11_display = XOpenDisplay(NULL);
char * modifiers = XSetLocaleModifiers ("@im=none"); 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); xim = XOpenIM (x11_display, NULL, NULL, NULL);