aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Client.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-31 12:53:30 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-31 12:53:30 +0200
commit3f7bb584e1b56f787cc0b4bef684afc669359e83 (patch)
tree164b21be69dce127910dacfb27647da0b42681ea /nx-X11/programs/Xserver/hw/nxagent/Client.h
parent4904bfe1f57d50134fd12a08424d299ef4094ef5 (diff)
parent49d63d92a81ff5157c18bbdc9a3b0cba1b70d425 (diff)
downloadnx-libs-3f7bb584e1b56f787cc0b4bef684afc669359e83.tar.gz
nx-libs-3f7bb584e1b56f787cc0b4bef684afc669359e83.tar.bz2
nx-libs-3f7bb584e1b56f787cc0b4bef684afc669359e83.zip
Merge branch 'uli42-pr/clipboard_dump' into 3.6.x
Attributes GH PR #918: https://github.com/ArcticaProject/nx-libs/pull/918
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Client.h')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Client.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.h b/nx-X11/programs/Xserver/hw/nxagent/Client.h
index a3e6e3cf3..ac2f34e8b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.h
@@ -75,8 +75,8 @@ extern void nxagentClientStateCallback(CallbackListPtr *callbacks, void *data, v
#define nxagentClientIsDialog(pClient) \
(nxagentClientHint(pClient) == NXCLIENT_DIALOG)
-#define nxagentClientInfoString(pClient) \
- (nxagentClientPriv(pClient) -> clientInfoString)
+#define nxagentClientInfoString(pClient) \
+ ((pClient) ? nxagentClientPriv(pClient) -> clientInfoString : NULL)
/*
* The actual reason why the client is sleeping.