Differences From Artifact [31ff560703]:
- File
src/OFTimer.m
— part of check-in
[6b77a5dd8b]
at
2017-05-21 21:28:57
on branch trunk
— Prefix private methods with of_ instead of OF_
This matches Apple's style. (user: js, size: 10534) [annotate] [blame] [check-ins using]
To Artifact [ce12a725d9]:
- File src/OFTimer.m — part of check-in [1164147eec] at 2017-08-11 21:02:54 on branch trunk — OFTimer: Keep the original interval on overrun (user: js, size: 10822) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
361 362 363 364 365 366 367 |
id target = [[_target retain] autorelease];
id object1 = [[_object1 retain] autorelease];
id object2 = [[_object2 retain] autorelease];
OF_ENSURE(_arguments <= 2);
if (_repeats && _valid) {
| > > > > > > > > > > > | | < | 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 |
id target = [[_target retain] autorelease];
id object1 = [[_object1 retain] autorelease];
id object2 = [[_object2 retain] autorelease];
OF_ENSURE(_arguments <= 2);
if (_repeats && _valid) {
int missedIntervals =
-[_fireDate timeIntervalSinceNow] / _interval;
of_time_interval_t newFireDate;
/* In case the clock was changed backwards */
if (missedIntervals < 0)
missedIntervals = 0;
newFireDate = [_fireDate timeIntervalSince1970] +
(missedIntervals + 1) * _interval;
[_fireDate release];
_fireDate = [[OFDate alloc]
initWithTimeIntervalSince1970: newFireDate];
[[OFRunLoop currentRunLoop] addTimer: self];
} else
[self invalidate];
#ifdef OF_HAVE_BLOCKS
if (_block != NULL)
|
| ︙ | ︙ |