gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "commit 96bacd3 may crash on X11" (#873)

Browse Source
This commit is contained in:
ManoloFLTK 2023-12-21 14:22:08 +01:00
parent 76a2c95f07
commit 42ff55026e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Fl_x.cxx
View File

@ -531,8 +531,8 @@ void Fl_X11_Screen_Driver::disable_im() {
}
void Fl_X11_Screen_Driver::open_display_platform() {
static GC gc = NULL;
if (gc) return;
static Display *d = NULL;
if (d) return;
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
@ -540,7 +540,7 @@ void Fl_X11_Screen_Driver::open_display_platform() {
XSetIOErrorHandler(io_error_handler);
XSetErrorHandler(xerror_handler);
Display *d = (fl_display ? fl_display : XOpenDisplay(0));
d = (fl_display ? fl_display : XOpenDisplay(0));
if (!d) {
Fl::fatal("Can't open display: %s", XDisplayName(0)); // does not return
return; // silence static code analyzer
@ -548,7 +548,7 @@ void Fl_X11_Screen_Driver::open_display_platform() {
open_display_i(d);
// the unique GC used by all X windows
gc = XCreateGC(fl_display, RootWindow(fl_display, fl_screen), 0, 0);
GC gc = XCreateGC(fl_display, RootWindow(fl_display, fl_screen), 0, 0);
Fl_Graphics_Driver::default_driver().gc(gc);
fl_create_print_window();
}