diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
| commit | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (patch) | |
| tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/modules/om/generic/omTextEsc.c | |
| parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
| parent | 4875a15ca61358a1c95b156b2279fce092451278 (diff) | |
| download | nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.gz nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.bz2 nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.zip | |
Merge branch 'uli42-pr/update_libX11_2022' into 3.6.x
Attributes GH PR #1037: https://github.com/ArcticaProject/nx-libs/pull/1037
Diffstat (limited to 'nx-X11/lib/modules/om/generic/omTextEsc.c')
| -rw-r--r-- | nx-X11/lib/modules/om/generic/omTextEsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/modules/om/generic/omTextEsc.c b/nx-X11/lib/modules/om/generic/omTextEsc.c index df1fb10c0..2aaff73db 100644 --- a/nx-X11/lib/modules/om/generic/omTextEsc.c +++ b/nx-X11/lib/modules/om/generic/omTextEsc.c @@ -169,10 +169,10 @@ TextWidthWithFontSet( * */ - if(fd == (FontData) NULL || - (font = font_set->font) == (XFontStruct *) NULL) { + if((font = font_set->font) == (XFontStruct *) NULL) { - if((font = fd->font) == (XFontStruct *) NULL) + if(fd == (FontData) NULL || + (font = fd->font) == (XFontStruct *) NULL) break; } |