[INFER] Fix merge botch.
authorBrian Hackett <bhackett1024@gmail.com>
Sun, 15 May 2011 08:44:01 -0700
changeset 75054 693a36f402eef8b9ab13f3b353878fadc72c8fed
parent 75053 a7b22d3523be8abec2f11a860846e633122961d3
child 75055 ea96c0f86648997d658ed7c464ec3d246284eb2f
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone6.0a1
[INFER] Fix merge botch.
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7285,17 +7285,18 @@ var FeedHandler = {
     return this._feedMenupopup = document.getElementById("multipleFeedsMenuState");
   },
 
   /**
    * Update the browser UI to show whether or not feeds are available when
    * a page is loaded or the user switches tabs to a page that has feeds.
    */
   updateFeeds: function() {
-    clearTimeout(this._updateFeedTimeout);
+    if (this._updateFeedTimeout)
+      clearTimeout(this._updateFeedTimeout);
 
     var feeds = gBrowser.selectedBrowser.feeds;
     var haveFeeds = feeds && feeds.length > 0;
 
     var feedButton = document.getElementById("feed-button");
     if (feedButton)
       feedButton.disabled = !haveFeeds;