aboutsummaryrefslogtreecommitdiff
path: root/libXext/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-23 14:53:52 +0200
committermarha <marha@users.sourceforge.net>2012-04-23 14:53:52 +0200
commitcd27f58626705bcb561115b8e5b0d1430df83fa6 (patch)
tree0fea00b96d0cb4a9d55bd0792e5b4634c78864d6 /libXext/src
parent588abfd54eb267dd79fe441e42aee9fc7534eb6e (diff)
parentb68922d51f52ca6ab9daa0105ef5c57f35bfbdcf (diff)
downloadvcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.tar.gz
vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.tar.bz2
vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXext/src')
-rw-r--r--libXext/src/Xge.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libXext/src/Xge.c b/libXext/src/Xge.c
index 74e48020a..1f37e596d 100644
--- a/libXext/src/Xge.c
+++ b/libXext/src/Xge.c
@@ -218,7 +218,15 @@ _xgeDpyClose(Display* dpy, XExtCodes* codes)
XFree(xge_data);
}
- return XextRemoveDisplay(xge_info, dpy);
+ if(!XextRemoveDisplay(xge_info, dpy))
+ return 0;
+
+ if (xge_info->ndisplays == 0) {
+ XextDestroyExtension(xge_info);
+ xge_info = NULL;
+ }
+
+ return 1;
}
/*