Merge pull request #668 from barijaona/bugfixes

Bug fixes (continued)
ViennaRSS · Jun 8, 2016 · 3b4112c · 3b4112c
2 parents 8fd28b3 + 2e84a73
commit 3b4112c
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 8 deletions.
diff --git a/SharedSupport/Styles/Classy.viennastyle/stylesheet.css b/SharedSupport/Styles/Classy.viennastyle/stylesheet.css
@@ -45,4 +45,5 @@ embed, video {
 img {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  height: auto !important;
 }
diff --git a/SharedSupport/Styles/Default.viennastyle/stylesheet.css b/SharedSupport/Styles/Default.viennastyle/stylesheet.css
@@ -92,4 +92,5 @@ embed, video {
 img {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  height: auto !important;
 }
diff --git a/SharedSupport/Styles/FeedLight Aqua.viennastyle/stylesheet.css b/SharedSupport/Styles/FeedLight Aqua.viennastyle/stylesheet.css
@@ -198,4 +198,5 @@ embed, video {
 img {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  height: auto !important;
 }
diff --git a/SharedSupport/Styles/FeedLight Graphite.viennastyle/stylesheet.css b/SharedSupport/Styles/FeedLight Graphite.viennastyle/stylesheet.css
@@ -198,4 +198,5 @@ embed, video {
 img {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  height: auto !important;
 }
diff --git a/SharedSupport/Styles/Minimalista Sans-serif.viennastyle/stylesheet.css b/SharedSupport/Styles/Minimalista Sans-serif.viennastyle/stylesheet.css
@@ -96,4 +96,5 @@ img {
 	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
+	height: auto !important;
 }
diff --git a/SharedSupport/Styles/Minimalista Serif.viennastyle/stylesheet.css b/SharedSupport/Styles/Minimalista Serif.viennastyle/stylesheet.css
@@ -96,4 +96,5 @@ img {
 	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
+	height: auto !important;
 }
diff --git a/SharedSupport/Styles/Papes.viennastyle/stylesheet.css b/SharedSupport/Styles/Papes.viennastyle/stylesheet.css
@@ -140,4 +140,5 @@ embed, video {
 img {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  height: auto !important;
 }
diff --git a/SharedSupport/Styles/Perlucida.viennastyle/stylesheet.css b/SharedSupport/Styles/Perlucida.viennastyle/stylesheet.css
@@ -104,4 +104,5 @@ body {
 	img {
 	  box-sizing: border-box;
 	  -webkit-box-sizing: border-box;
+	  height: auto !important;
 	}
diff --git a/SharedSupport/Styles/Serifim Dark.viennastyle/stylesheet.css b/SharedSupport/Styles/Serifim Dark.viennastyle/stylesheet.css
@@ -132,6 +132,7 @@ ul {
   max-width: 100%;
   clear: both;
   margin-bottom: 1em;
+  height: auto !important;
 }
 
 .articleBody img {

diff --git a/SharedSupport/Styles/Serifim Light.viennastyle/stylesheet.css b/SharedSupport/Styles/Serifim Light.viennastyle/stylesheet.css
@@ -132,4 +132,5 @@ ul {
   max-width: 100%;
   clear: both;
   margin-bottom: 1em;
+  height: auto !important;
 }
diff --git a/SharedSupport/Styles/Tyger graphite.viennastyle/stylesheet.css b/SharedSupport/Styles/Tyger graphite.viennastyle/stylesheet.css
@@ -92,4 +92,5 @@ embed, video {
 img {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  height: auto !important;
 }
diff --git a/SharedSupport/Styles/Tyger.viennastyle/stylesheet.css b/SharedSupport/Styles/Tyger.viennastyle/stylesheet.css
@@ -84,4 +84,5 @@ img, table, td, blockquote, code, pre, textarea, input, iframe, object, embed, v
 img {
 	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
+	height: auto !important;
 }
diff --git a/SharedSupport/Styles/Xcast.viennastyle/stylesheet.css b/SharedSupport/Styles/Xcast.viennastyle/stylesheet.css
@@ -49,4 +49,5 @@ embed, video {
 img {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  height: auto !important;
 }
diff --git a/src/AppController.h b/src/AppController.h
@@ -91,7 +91,7 @@
 	NSMutableDictionary * scriptPathMappings;
 	NSMenu * appDockMenu;
 	NSStatusItem * appStatusItem;
-	BOOL isProgressAnimatorActive;
+	NSInteger progressCount;
 	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];
-		isProgressAnimatorActive = NO;
+		progressCount = 0;
 		persistedStatusText = nil;
 		lastCountOfUnread = 0;
 		appStatusItem = nil;
@@ -3900,22 +3900,20 @@ -(void)sendBlogEvent:(NSString *)externalEditorBundleIdentifier title:(NSString
  */
 -(void)startProgressIndicator
 {
-	if (!isProgressAnimatorActive) {
+	if (progressCount++ == 0)
 		[spinner startAnimation:self];
-		isProgressAnimatorActive = YES;
-	}
 }
 
 /* stopProgressIndicator
  * Stops the progress indicator on the info bar running
  */
 -(void)stopProgressIndicator
 {
-	NSAssert(isProgressAnimatorActive, @"Called stopProgressIndicator without a matching startProgressIndicator");
-	if (isProgressAnimatorActive)
+	NSAssert(progressCount > 0, @"Called stopProgressIndicator without a matching startProgressIndicator");
+	if (--progressCount < 1)
 	{
 		[spinner stopAnimation:self];
-		isProgressAnimatorActive = NO;
+		progressCount = 0;
 	}
 }
 

diff --git a/src/FoldersTree.m b/src/FoldersTree.m
@@ -492,6 +492,10 @@ -(NSInteger)nextFolderWithUnreadAfterNode:(TreeNode *)startingNode
 	    node = startingNode.parentNode.nextSibling;
 	};
 	if (node ==nil)
+	{
+		node = startingNode.parentNode.parentNode.firstChild;
+	}
+	if (node ==nil)
 	{
 		node = startingNode.parentNode.firstChild;
 	}