From b317a1cd52baaa84c3c6679c26eaff928d203afd Mon Sep 17 00:00:00 2001 From: rfm Date: Tue, 25 Mar 2014 10:29:35 +0000 Subject: [PATCH] Fix for logic of 'executing' state by Fred git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37763 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 +++++- Source/NSOperation.m | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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"];