[tor-commits] [torbutton/master] Bug 15915: Hide circuit display if it is disabled.

[gk at torproject.org]

commit fc05d63ab7f01fabf999960d31a9795349054a7b
Author: anonym <anonym at riseup.net>
Date:   Mon May 4 11:04:29 2015 +0200

    Bug 15915: Hide circuit display if it is disabled.
    
    If extensions.torbutton.display_circuit = false from the start, then
    myController will never be set, so when we call stop() we won't call
    syncDisplayWithSelectedTab(false) to hide the circuit display.
---
 src/chrome/content/tor-circuit-display.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js
index 4197944..2da7f0a 100644
--- a/src/chrome/content/tor-circuit-display.js
+++ b/src/chrome/content/tor-circuit-display.js
@@ -315,8 +315,8 @@ let setupDisplay = function (host, port, password, enablePrefName) {
   let myController = null,
       stopCollectingIsolationData = null,
       stop = function() {
+        syncDisplayWithSelectedTab(false);
         if (myController) {
-          syncDisplayWithSelectedTab(false);
           if (stopCollectingIsolationData) {
 	    stopCollectingIsolationData();
           }