diff --git a/ChangeLog b/ChangeLog index 6859ca1da..5f0954d17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-25 Fred Kiefer + + * Tools/NSOperation.m: ([_finish]) fix logic of 'executing' flag. + 2014-03-19 Richard Frith-Macdonald * Tools/gdomap.c: Don't open syslog connection until after we have @@ -10177,7 +10181,7 @@ which is used there were erroneously changed to assume an NSNumber. This was causing a crash in various applications. -2009-04-24 Fred Morcos +2009-04-24 Fred Morcos * Headers/Foundation/NSFileManager.h: * Source/NSFileManager.m: diff --git a/Source/NSOperation.m b/Source/NSOperation.m index fc5f4eb61..3cc8134b5 100644 --- a/Source/NSOperation.m +++ b/Source/NSOperation.m @@ -521,7 +521,7 @@ static NSArray *empty = nil; [internal->lock lock]; if (NO == internal->finished) { - if (NO == internal->executing) + if (YES == internal->executing) { [self willChangeValueForKey: @"isExecuting"]; [self willChangeValueForKey: @"isFinished"];