prevent cyclical scrolling in headlines if next offset requested by infscroll is zero

a bunch of other related fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/js/feedlist.js b/js/feedlist.js
index 05c502284..ad9d8dcfa 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -72,12 +72,12 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req, can_w
 		if (!background) {
 			_viewfeed_last = get_timestamp();
 
-			if (getActiveFeedId() != feed || offset == 0) {
+			if (getActiveFeedId() != feed || !infscroll_req) {
 				setActiveArticleId(0);
 				_infscroll_disable = 0;
 			}
 
-			if (offset != 0 && !method) {
+			if (infscroll_req && !method) {
 				var timestamp = get_timestamp();
 
 				if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {