[tbb-commits] [torbutton/master] Bug 40005: Initialize the identity UI before setting up the circuit display

[gk at torproject.org]

commit c36ccb5874a318b82310631306f73acfe4ca0eaf
Author: Alex Catarineu <acat at torproject.org>
Date:   Fri Jul 31 13:39:09 2020 +0200

    Bug 40005: Initialize the identity UI before setting up the circuit display
    
    Caused by https://bugzilla.mozilla.org/show_bug.cgi?id=1646780.
---
 chrome/content/tor-circuit-display.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js
index 8a51bbfd..1be4571d 100644
--- a/chrome/content/tor-circuit-display.js
+++ b/chrome/content/tor-circuit-display.js
@@ -445,6 +445,10 @@ let ensureCorrectPopupDimensions = function () {
 // the "enablePref" is set to true, and stopped when it is set to false.
 // A reference to this function (called createTorCircuitDisplay) is exported as a global.
 let setupDisplay = function (enablePrefName) {
+  // From 79 on the identity popup is initialized lazily
+  if (gIdentityHandler._initializePopup) {
+    gIdentityHandler._initializePopup();
+  }
   setupGuardNote();
   let myController = null,
       stopCollectingIsolationData = null,