diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-07 23:19:33 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-07 23:19:33 +0100 |
| commit | aecdb52661898d0ba400a61550fa6ce9c0a4d829 (patch) | |
| tree | f3c82763aa3f6c19da425e75c5c37dae228f38b4 /nx-X11/programs/Xserver/Xext/sync.c | |
| parent | cbdae3b71bfc654cfc0c81b1ddf51975bcb93146 (diff) | |
| parent | 5ec2366c40a540245be4a643fcf740fb16bcec50 (diff) | |
| download | nx-libs-aecdb52661898d0ba400a61550fa6ce9c0a4d829.tar.gz nx-libs-aecdb52661898d0ba400a61550fa6ce9c0a4d829.tar.bz2 nx-libs-aecdb52661898d0ba400a61550fa6ce9c0a4d829.zip | |
Merge branch 'uli42-pr/update_xext' into 3.6.x
Attributes GH PR #643: https://github.com/ArcticaProject/nx-libs/pull/643
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/sync.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/sync.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 7fa6145a6..e90e35db9 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -296,14 +296,18 @@ static void SyncDeleteTriggerFromCounter(pTrigger) SyncTrigger *pTrigger; { - SyncTriggerList *pCur, *pPrev = NULL; + SyncTriggerList *pCur; + SyncTriggerList *pPrev; /* pCounter needs to be stored in pTrigger before calling here. */ if (!pTrigger->pCounter) return; - for (pCur = pTrigger->pCounter->pTriglist; pCur; pCur = pCur->next) + pPrev = NULL; + pCur = pTrigger->pCounter->pTriglist; + + while (pCur) { if (pCur->pTrigger == pTrigger) { @@ -311,9 +315,13 @@ SyncDeleteTriggerFromCounter(pTrigger) pPrev->next = pCur->next; else pTrigger->pCounter->pTriglist = pCur->next; + free(pCur); break; } + + pPrev = pCur; + pCur = pCur->next; } if (IsSystemCounter(pTrigger->pCounter)) |