Commit: cbde8db9d90eea5b5362b0acc714e1d0dbba2fd9 - KakuriNoMiya (git)

BathyScapheの中身をぐちゃぐちゃに

Commit MetaInfo

• Revision: cbde8db9d90eea5b5362b0acc714e1d0dbba2fd9 (tree)
• Zeit: 2012-07-07 20:22:07
• Autor: masakih <masakih@b61f...>
• Commiter: masakih

Log Message

Fix #28917.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/bathyscaphe/bathyscaphe/trunk@1438 b61fe662-1e22-0410-9ebe-d5d0f6be7d5c

Ändern Zusammenfassung

• modified: application/source/browser/BSBoardListItemHEADCheckTask.m
• modified: application/source/browser/BSThreadListTask.m
• modified: application/source/browser/BSThreadsListOPTask.m
• modified: changelog.txt

Diff

--- a/application/source/browser/BSBoardListItemHEADCheckTask.m
+++ b/application/source/browser/BSBoardListItemHEADCheckTask.m
@@ -152,6 +152,7 @@ static BOOL shouldCheckItemHeader(id dict);
                 id pool2 = [[NSAutoreleasePool alloc] init];
 				[loop runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
 				[pool2 release];
+				if(self.isInterrupted) return;
             }
             if (!(checker.lastError) && checker.isUpdated) {
                 [updatedThreads addObject:thread];
@@ -172,6 +173,7 @@ static BOOL shouldCheckItemHeader(id dict);
 		[pool release];
 	}
 	
+	if(self.isInterrupted) return;
 	[self updateDB:updatedThreads];
 	
 	numberOfChecked = numberOfAllTarget - numberOfSkip;
@@ -181,8 +183,8 @@ static BOOL shouldCheckItemHeader(id dict);
 		[[CMRFavoritesManager defaultManager] decrementHEADCheckCount];
 	}
 	
+	if(self.isInterrupted) return;
 	[targetList updateCursor];
-	
 }
 
 - (NSArray *)threadInfomations

--- a/application/source/browser/BSThreadListTask.m
+++ b/application/source/browser/BSThreadListTask.m
@@ -81,7 +81,10 @@
 }
 
 - (void)excute {}
-- (void)cancel:(id)sender {}
+- (void)cancel:(id)sender
+{
+	self.isInterrupted = YES;
+}
 
 - (void)finalizeWhenInterrupted
 {

--- a/application/source/browser/BSThreadsListOPTask.m
+++ b/application/source/browser/BSThreadsListOPTask.m
@@ -203,9 +203,10 @@ fail:
 		}
 	}
 	
-abort:
+	if(self.isInterrupted) goto abort;
 	[self.targetList updateCursor];
 	
+abort:
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 

--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
[phone] masakih <[e-mail]>
+	* application/source/browser/BSBoardListItemHEADCheckTask.m:
+	* application/source/browser/BSThreadListTask.m:
+	* application/source/browser/BSThreadsListOPTask.m:
+		更新処理終了後にクラッシュする問題を修正。
 2012-07-07 tsawada2 <[e-mail]>
 	* frameworks/SGFoundation/framework/source/extensions/URL/NSURL-SGExtensions.m
 		fragment が複数含まれる URL 文字列を NSURL に変換しようとすると nil になる NSURL のバグを回避。