diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-23 14:53:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-23 14:53:52 +0200 |
| commit | cd27f58626705bcb561115b8e5b0d1430df83fa6 (patch) | |
| tree | 0fea00b96d0cb4a9d55bd0792e5b4634c78864d6 /libXext | |
| parent | 588abfd54eb267dd79fe441e42aee9fc7534eb6e (diff) | |
| parent | b68922d51f52ca6ab9daa0105ef5c57f35bfbdcf (diff) | |
| download | vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.tar.gz vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.tar.bz2 vcxsrv-cd27f58626705bcb561115b8e5b0d1430df83fa6.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXext')
| -rw-r--r-- | libXext/include/X11/extensions/sync.h | 2 | ||||
| -rw-r--r-- | libXext/src/Xge.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libXext/include/X11/extensions/sync.h b/libXext/include/X11/extensions/sync.h index d3a239f66..31b1be064 100644 --- a/libXext/include/X11/extensions/sync.h +++ b/libXext/include/X11/extensions/sync.h @@ -203,7 +203,7 @@ typedef struct { } XSyncCounterNotifyEvent; typedef struct { - int type; /* event base + XSyncCounterNotify */ + int type; /* event base + XSyncAlarmNotify */ unsigned long serial; /* # of last request processed by server */ Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ 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; } /* |