[tor-commits] [torbutton/master] Let's double-check the cookie env-var exists

[mikeperry at torproject.org]

commit 1c403f45618e500034533c9274aa0fa1227877c8
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed Sep 28 21:45:18 2011 -0700

    Let's double-check the cookie env-var exists
---
 src/chrome/content/torbutton.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 5ee1a53..0d7ef88 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -525,7 +525,7 @@ function torbutton_init() {
         // FIXME: We might want a check to use to set this in the future,
         // but this works fine for now.
         m_tb_tbb = true;
-    } else {
+    } else if (environ.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) {
         var cookie_path = environ.get("TOR_CONTROL_COOKIE_AUTH_FILE");
         try {
             if ("" != cookie_path) {