Skip to content

N
nx-libs
Commit e85c6885 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mihai Moldovan
Browse files
Options

Xext: lift sync.c to xorg-xserver-7.1/1.1 state

parent 62373d42
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 2 deletions
nx-X11/programs/Xserver/Xext/sync.c
View file @ e85c6885
...@@ -296,14 +296,18 @@ static void ...@@ -296,14 +296,18 @@ static void
SyncDeleteTriggerFromCounter(pTrigger) SyncDeleteTriggerFromCounter(pTrigger)
SyncTrigger *pTrigger; SyncTrigger *pTrigger;
{ {
SyncTriggerList *pCur, *pPrev = NULL; SyncTriggerList *pCur;
SyncTriggerList *pPrev;
/* pCounter needs to be stored in pTrigger before calling here. */ /* pCounter needs to be stored in pTrigger before calling here. */
if (!pTrigger->pCounter) if (!pTrigger->pCounter)
return; return;
for (pCur = pTrigger->pCounter->pTriglist; pCur; pCur = pCur->next) pPrev = NULL;
pCur = pTrigger->pCounter->pTriglist;
while (pCur)
{ {
if (pCur->pTrigger == pTrigger) if (pCur->pTrigger == pTrigger)
{ {
...@@ -311,9 +315,14 @@ SyncDeleteTriggerFromCounter(pTrigger) ...@@ -311,9 +315,14 @@ SyncDeleteTriggerFromCounter(pTrigger)
pPrev->next = pCur->next; pPrev->next = pCur->next;
else else
pTrigger->pCounter->pTriglist = pCur->next; pTrigger->pCounter->pTriglist = pCur->next;
xfree(pCur);
free(pCur); free(pCur);
break; break;
} }
pPrev = pCur;
pCur = pCur->next;
} }
if (IsSystemCounter(pTrigger->pCounter)) if (IsSystemCounter(pTrigger->pCounter))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment