gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix logic error in case where we have a nil date supplied

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39996 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-07-13 10:51:29 +00:00
parent 4f05189210
commit 25df4a6efb
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Source/NSRunLoop.m
View file

@ -1282,25 +1282,31 @@ updateTimer(NSTimer *t, NSDate *d, NSTimeInterval now)
_currentMode = savedMode;
/* Find out how long we can wait before first limit date.
* If there are no input sources or timers, return immediately.
*/
d = [self limitDateForMode: mode];
if (nil == d || nil == date)
if (nil == d)
{
[arp drain];
return NO;
}
/* Use the earlier of the two dates we have.
* Retain the date in case the firing of a timer (or some other event)
* releases it.
/* Use the earlier of the two dates we have (nil date is like distant past).
*/
d = [d earlierDate: date];
[d retain];
if (nil == date)
{
[self acceptInputForMode: mode beforeDate: nil];
}
else
{
/* Retain the date in case the firing of a timer (or some other event)
* releases it.
*/
d = [[d earlierDate: date] copy];
[self acceptInputForMode: mode beforeDate: d];
[d release];
}
/* Wait, listening to our input sources. */
[self acceptInputForMode: mode beforeDate: d];
[d release];
[arp drain];
return YES;
}