aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/src/CopyCmap.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2022-01-19 00:45:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-04-27 14:08:46 +0200
commit4875a15ca61358a1c95b156b2279fce092451278 (patch)
tree79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/src/CopyCmap.c
parenta502149a844736dcc7f7dedd7c63229c74a448ee (diff)
downloadnx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.gz
nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.bz2
nx-libs-4875a15ca61358a1c95b156b2279fce092451278.zip
Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78
Diffstat (limited to 'nx-X11/lib/src/CopyCmap.c')
-rw-r--r--nx-X11/lib/src/CopyCmap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/nx-X11/lib/src/CopyCmap.c b/nx-X11/lib/src/CopyCmap.c
index 5444550cd..b37aba733 100644
--- a/nx-X11/lib/src/CopyCmap.c
+++ b/nx-X11/lib/src/CopyCmap.c
@@ -53,12 +53,17 @@ Colormap XCopyColormapAndFree(
mid = req->mid = XAllocID(dpy);
req->srcCmap = src_cmap;
+ /* re-lock the display to keep XID handling in sync */
UnlockDisplay(dpy);
SyncHandle();
+ LockDisplay(dpy);
#if XCMS
_XcmsCopyCmapRecAndFree(dpy, src_cmap, mid);
#endif
+ UnlockDisplay(dpy);
+ SyncHandle();
+
return(mid);
}