Commit 5088e918 authored by henry's avatar henry Committed by morgan
Browse files

fixup! TB 40597: Implement TorSettings module 

TB 45058: Clean up TorSettings double init logic.
parent 550bff23

toolkit/modules/TorSettings.sys.mjs

+8 −1
Original line number Diff line number Diff line
@@ -358,6 +358,12 @@ class TorSettingsImpl { 
   */

  #initialized = false;



  /**

   * Whether init has been called.

   *

   * @type {boolean}

   */

  #initCalled = false;

  /**

   * Whether uninit cleanup has been called.

   *
@@ -510,11 +516,12 @@ class TorSettingsImpl { 
   * Load or init our settings.

   */

  async init() {

    if (this.#initialized) {

    if (this.#initCalled) {

      lazy.logger.warn("Called init twice.");

      await this.#initializedPromise;

      return;

    }

    this.#initCalled = true;

    try {

      await this.#initInternal();

      this.#initialized = true;