[tor-commits] [torbutton] branch main updated: Bug 41409: Restored the creation of the circuit display at torbutton initialization

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch main
in repository torbutton.

The following commit(s) were added to refs/heads/main by this push:
     new 716c4038 Bug 41409: Restored the creation of the circuit display at torbutton initialization
716c4038 is described below

commit 716c40385cd8330548d4c371b700bd9a65228fa6
Author: Pier Angelo Vendrame <pierov@xxxxxxxxxxxxxx>
AuthorDate: Fri Oct 28 17:59:15 2022 +0200

    Bug 41409: Restored the creation of the circuit display at torbutton initialization
---
 chrome/content/torbutton.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js
index 3400a32a..0959efc4 100644
--- a/chrome/content/torbutton.js
+++ b/chrome/content/torbutton.js
@@ -274,6 +274,16 @@ var torbutton_new_circuit;
     torbutton_log(1, "registering Tor check observer");
     torbutton_tor_check_observer.register();
 
+    // Create the circuit display even though the control port might not be
+    // ready yet, as the circuit display will wait for the controller to be
+    // available anyway.
+    try {
+      createTorCircuitDisplay("extensions.torbutton.display_circuit");
+      circuitDisplayCreated = true;
+    } catch (e) {
+      torbutton_log(4, "Error creating the tor circuit display " + e);
+    }
+
     // Arrange for our about:tor content script to be loaded in each frame.
     window.messageManager.loadFrameScript(
       "chrome://torbutton/content/aboutTor/aboutTor-content.js",
@@ -290,11 +300,6 @@ var torbutton_new_circuit;
     async receiveMessage(aMessage) {
       switch (aMessage.name) {
         case "AboutTor:Loaded":
-          try {
-            createTorCircuitDisplay("extensions.torbutton.display_circuit");
-          } catch (e) {
-            torbutton_log(4, "Error creating the tor circuit display " + e);
-          }
           aMessage.target.messageManager.sendAsyncMessage(
             "AboutTor:ChromeData",
             await this.getChromeData(true)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits