[or-cvs] [torbutton/master 06/30] Fix bug 1169 - Popup conflict with CoolPreviews 3.0.1

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Thu, 18 Mar 2010 04:48:42 -0700
Subject: Fix bug 1169 - Popup conflict with CoolPreviews 3.0.1
Commit: acc70ee8001137408d1bced43ce6b1f964bd0d2f

---
 src/chrome/content/torbutton.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index dcf327d..750efff 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -3480,7 +3480,9 @@ function torbutton_update_tags(win, new_loc) {
             // Purge session history every time we fetch a new doc 
             // in a new tor state
             torbutton_log(2, "Purging session history");
-            if(browser.webNavigation.sessionHistory.count > 1
+            // sessionHistory can be null now...
+            if(browser.webNavigation.sessionHistory
+                    && browser.webNavigation.sessionHistory.count > 1
                     && m_tb_prefs.getBoolPref("extensions.torbutton.block_js_history")) {
                 // FIXME: This isn't quite right.. For some reason
                 // this breaks in some cases..
-- 
1.6.5