fix bug in previous patch, take two on closing #63

2 files changed, 7 insertions, 1 deletions

diff --git a/backend.php b/backend.php
index 066700dc5..9d4c694a4 100644
--- a/backend.php
+++ b/backend.php
@@ -106,6 +106,12 @@
 
 		setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH);
 		setcookie('ttrss_vf_daemon', ENABLE_UPDATE_DAEMON);
+
+		if (get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED")) {		
+			setcookie('ttrss_vf_catchupnext', 1);
+		} else {
+			setcookie('ttrss_vf_catchupnext', 0);
+		}		
 	}
 
 	$fetch = $_GET["fetch"];
diff --git a/feedlist.js b/feedlist.js
index f1038d613..2bd584797 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -116,7 +116,7 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) {
 			var next_unread_feed = getRelativeFeedId(feedlist,
 					getActiveFeedId(), "next", true);
 
-			if (next_unread_feed) {
+			if (next_unread_feed && getCookie('ttrss_vf_catchupnext') == 1) {
 				query = query + "&nuf=" + param_escape(next_unread_feed);
 				setActiveFeedId(next_unread_feed);
 			}