assign hash-stored feed_id/is_cat earlier on startup

[tt-rss.git] / js / tt-rss.js

diff --git a/js/tt-rss.js b/js/tt-rss.js
index eb0ec664dc2ab12264d96d6b7fc6158e5791e0f8..054ccf3df992c481a36f2cd56a34e93ebaebbd95 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -100,13 +100,6 @@ function updateFeedList() {
                dojo.disconnect(tmph);
                        Element.hide("feedlistLoading");
 
-                       var hash_feed_id = hash_get('f');
-                       var hash_feed_is_cat = hash_get('c') == "1";
-
-                       if (hash_feed_id != undefined) {
-                               setActiveFeedId(hash_feed_id, hash_feed_is_cat);
-                       }
-
                        feedlist_init();
 
 //                     var node = dijit.byId("feedTree")._itemNodesMap['FEED:-2'][0].domNode
@@ -290,6 +283,13 @@ function init_second_stage() {
 
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
+               var hash_feed_id = hash_get('f');
+               var hash_feed_is_cat = hash_get('c') == "1";
+
+               if (hash_feed_id != undefined) {
+                       setActiveFeedId(hash_feed_id, hash_feed_is_cat);
+               }
+
                loading_set_progress(30);
 
                // can't use cache_clear() here because viewfeed might not have initialized yet