Fix an assertion failure with progress indicator

ViennaRSS · Jun 4, 2016 · 07975ea · 07975ea
1 parent 89efe99
commit 07975ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/AppController.h b/src/AppController.h
@@ -91,7 +91,7 @@
 	NSMutableDictionary * scriptPathMappings;
 	NSMenu * appDockMenu;
 	NSStatusItem * appStatusItem;
-	NSInteger progressCount;
+	BOOL isProgressAnimatorActive;
 	NSDictionary * standardURLs;
 	NSTimer * checkTimer;
 	NSInteger lastCountOfUnread;

diff --git a/src/AppController.m b/src/AppController.m
@@ -143,7 +143,7 @@ -(instancetype)init
 	if ((self = [super init]) != nil)
 	{
 		scriptPathMappings = [[NSMutableDictionary alloc] init];
-		progressCount = 0;
+		isProgressAnimatorActive = NO;
 		persistedStatusText = nil;
 		lastCountOfUnread = 0;
 		appStatusItem = nil;
@@ -3900,20 +3900,22 @@ -(void)sendBlogEvent:(NSString *)externalEditorBundleIdentifier title:(NSString
  */
 -(void)startProgressIndicator
 {
-	if (progressCount++ == 0)
+	if (!isProgressAnimatorActive) {
 		[spinner startAnimation:self];
+		isProgressAnimatorActive = YES;
+	}
 }
 
 /* stopProgressIndicator
  * Stops the progress indicator on the info bar running
  */
 -(void)stopProgressIndicator
 {
-	NSAssert(progressCount > 0, @"Called stopProgressIndicator without a matching startProgressIndicator");
-	if (--progressCount < 1)
+	NSAssert(isProgressAnimatorActive, @"Called stopProgressIndicator without a matching startProgressIndicator");
+	if (isProgressAnimatorActive)
 	{
 		[spinner stopAnimation:self];
-		progressCount = 0;
+		isProgressAnimatorActive = NO;
 	}
 }
 
@@ -4547,7 +4549,7 @@ -(NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *
 
 			//Ensure the spinner has the proper state; it may be added while we're refreshing
 			if (APP.refreshing)
-				[spinner startAnimation:self];
+				[self startProgressIndicator];
 		}
 		else
 		{