diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-08 22:55:52 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:44:08 +0200 |
| commit | 6663cbe68e7211337488d534bac82592b996bec6 (patch) | |
| tree | f2574f5145c25b11e7f3bb8b385df5ccf2f5cbbd /nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | |
| parent | ae44a8cd5c932f5a108dbc1cc92e3321f43b217d (diff) | |
| download | nx-libs-6663cbe68e7211337488d534bac82592b996bec6.tar.gz nx-libs-6663cbe68e7211337488d534bac82592b996bec6.tar.bz2 nx-libs-6663cbe68e7211337488d534bac82592b996bec6.zip | |
Clipboard.c: fix nested clipboard handling
Fixes ArcticaProject/nx-libs#632
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 400b966a6..e17ecef2c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1895,7 +1895,14 @@ int nxagentSendNotify(xEvent *event) fprintf(stderr, "%s: lastServerRequestor is [0x%x].\n", __func__, lastServerRequestor); #endif - if (event->u.selectionNotify.property == clientCutProperty) + /* + * If we have nested sessions there are situations where we do not + * need to send out anything to the real X server because + * communication happens completely between our own clients (some of + * which can be nxagents themselves). In that case we return 0 (tell + * dix to go on) and do nothing! + */ + if (event->u.selectionNotify.property == clientCutProperty && lastServerRequestor != None) { /* |