nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Combine XLoadFont and XQueryFont calls

Browse Source 
The separate calls crash if the font does not exist; the combined call
returns NULL, as the caller expects.

Resolves #1508 and possibly #569.
This commit is contained in:
Ray Chason
2026-08-18 13:40:35 +03:00
committed by Pasi Kallinen
parent ef5beb917a
commit 23315cf857
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/X11/winX.c
+1 -2
View File
@@ -3125,8 +3125,7 @@ X11_unicode_font(Display *display, XFontStruct *font)
strcpy(unicode_font + len, "iso10646-1"); strcpy(unicode_font + len, "iso10646-1");
font_name = unicode_font; font_name = unicode_font;
Font font_id = XLoadFont(display, font_name); XFontStruct *unifont = XLoadQueryFont(display, font_name);
XFontStruct *unifont = XQueryFont(display, font_id);
return unifont; return unifont;
} }
#endif /* ENHANCED_SYMBOLS */ #endif /* ENHANCED_SYMBOLS */