diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
| commit | b66699555d2e2503926f01a9c192481e01812399 (patch) | |
| tree | fa7f275b0bc74c3ed8e85538602ed8b6a8a0f4c2 /nx-X11/programs/Xserver/hw/nxagent/Screen.c | |
| parent | 3523d15e2a9f84e2136e3370129a9bea0e16e072 (diff) | |
| parent | 97a69b95ac3018f9a8838b09df28a0f33c484a0d (diff) | |
| download | nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.gz nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.bz2 nx-libs-b66699555d2e2503926f01a9c192481e01812399.zip | |
Merge branch 'uli42-pr/various6' into 3.6.x
Attributes GH PR #979: https://github.com/ArcticaProject/nx-libs/pull/979
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 86f88bb7b..d09c14692 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -2514,9 +2514,9 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin) if (nxagentKeyboard != NULL) { int i; - for (i = 0; nxagentKeyboard[i] != '/' && nxagentKeyboard[i] != 0; i++); + for (i = 0; nxagentKeyboard[i] != '/' && nxagentKeyboard[i] != '\0'; i++); - if(nxagentKeyboard[i] == 0 || nxagentKeyboard[i + 1] == 0 || i == 0) + if(nxagentKeyboard[i] == '\0' || nxagentKeyboard[i + 1] == '\0' || i == 0) { #ifdef WARNING fprintf(stderr,"WARNING! Wrong keyboard type: %s.\n", nxagentKeyboard); |