[tbb-commits] [tor-launcher/master] Bug 22592: Default bridge settings are not removed

[gk at torproject.org]

commit 2a938feb78b49098ead0599769835cbc2a7dc183
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Mon Jul 24 16:13:28 2017 -0400

    Bug 22592: Default bridge settings are not removed
    
    When the user clicks on "Remove Settings and Connect", clear the
    preference `extensions.torlauncher.default_bridge_type` to ensure
    that default bridges are not used any more.
---
 src/chrome/content/network-settings.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index 5df4e1e..830ef31 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -1493,6 +1493,9 @@ function applyBridgeSettings(aUseDefaults)
   if (!settings)
     return false;
 
+  if (aUseDefaults)
+    TorLauncherUtil.setCharPref(kPrefDefaultBridgeType, "");
+
   return setConfAndReportErrors(settings, "bridgeSettings");
 }