gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix bad return value when polling for windows messages

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@40000 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-07-16 08:25:24 +00:00
parent 39cc09e2ca
commit f8f4bb51e3
4 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/NSRunLoop.m
View file

@ -1163,11 +1163,6 @@ updateTimer(NSTimer *t, NSDate *d, NSTimeInterval now)
BOOL done = NO;
NSDate *when;
if ([_contextStack indexOfObjectIdenticalTo: context] == NSNotFound)
{
[_contextStack addObject: context];
}
while (NO == done)
{
when = [self _limitDateForContext: context];
@ -1224,6 +1219,10 @@ updateTimer(NSTimer *t, NSDate *d, NSTimeInterval now)
@"accept I/P before %d millisec from now in %@",
timeout_ms, mode);
if ([_contextStack indexOfObjectIdenticalTo: context] == NSNotFound)
{
[_contextStack addObject: context];
}
done = [context pollUntil: timeout_ms within: _contextStack];
if (NO == done)
{
@ -1236,16 +1235,18 @@ updateTimer(NSTimer *t, NSDate *d, NSTimeInterval now)
[self _checkPerformers: context];
GSPrivateNotifyASAP(_currentMode);
[context endPoll];
/* Once a poll has been completed on a context, we can remove that
* context from the stack even if it actually polling at an outer
* level of re-entrancy ... since the poll we have just done will
* have handled any events that the outer levels would have wanted
* to handle, and the polling for this context will be marked as
* ended.
*/
[_contextStack removeObjectIdenticalTo: context];
}
/* Once a poll has been completed on a context, we can remove that
* context from the stack even if it actually polling at an outer
* level of re-entrancy ... since the poll we have just done will
* have handled any events that the outer levels would have wanted
* to handle, and the polling for this context will be marked as ended.
*/
_currentMode = savedMode;
[_contextStack removeObjectIdenticalTo: context];
}
NS_HANDLER
{