2 files changed, 11 insertions, 3 deletions

diff --git a/src/feeds.c b/src/feeds.c
index 93bec891..87fd0d67 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -85,7 +85,8 @@ iDefineTypeConstructionArgs(FeedJob, (const iBookmark *bm), bm)
 
 /*----------------------------------------------------------------------------------------------*/
 
-static const char *feedsFilename_Feeds_ = "feeds.txt";
+static const char *feedsFilename_Feeds_         = "feeds.txt";
+static const int   updateIntervalSeconds_Feeds_ = 2 * 60 * 60;
 
 struct Impl_Feeds {
     iMutex *  mtx;
@@ -273,7 +274,7 @@ static iBool startWorker_Feeds_(iFeeds *d) {
 static uint32_t refresh_Feeds_(uint32_t interval, void *data) {
     /* Called in the SDL timer thread, so let's start a worker thread for running the update. */
     startWorker_Feeds_(&feeds_);
-    return 1000 * 60 * 60;
+    return 1000 * updateIntervalSeconds_Feeds_;
 }
 
 static void stopWorker_Feeds_(iFeeds *d) {
@@ -419,7 +420,13 @@ void init_Feeds(const char *saveDir) {
     init_PtrArray(&d->jobs);
     init_SortedArray(&d->entries, sizeof(iFeedEntry *), cmp_FeedEntryPtr_);
     load_Feeds_(d);
-    d->refreshTimer = SDL_AddTimer(5000, refresh_Feeds_, NULL);
+    /* Update feeds if it has been a while. */
+    int intervalSec = updateIntervalSeconds_Feeds_;
+    if (isValid_Time(&d->lastRefreshedAt)) {
+        const double elapsed = elapsedSeconds_Time(&d->lastRefreshedAt);
+        intervalSec = iMax(1, updateIntervalSeconds_Feeds_ - elapsed);
+    }
+    d->refreshTimer = SDL_AddTimer(1000 * intervalSec, refresh_Feeds_, NULL);
 }
 
 void deinit_Feeds(void) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 541cf5d6..ef88d989 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -368,6 +368,7 @@ iWidget *addAction_Widget(iWidget *parent, int key, int kmods, const char *comma
 
 static iBool isCommandIgnoredByMenus_(const char *cmd) {
     return equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.player.update") ||
+           startsWith_CStr(cmd, "feeds.update.") ||
            equal_Command(cmd, "document.request.updated") || equal_Command(cmd, "window.resized") ||
            (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
 }