Skip to content
Snippets Groups Projects
Commit d7f3375f authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

fixup! Bug 40597: Implement TorSettings module

Bug 41114: Refactor TorConnect.

Do not await TorSettings.applySettings after a successfull bootstrap.
Instead, we use .catch and log any unexpected results.
parent 47453181
Branches
No related tags found
1 merge request!980Bug 42512: Rebased alpha onto Firefox 115.10.0esr
......@@ -621,7 +621,14 @@ class AutoBootstrappingState extends StateCallback {
// Persist the current settings to preferences.
TorSettings.setSettings(currentSetting);
TorSettings.saveToPrefs();
await TorSettings.applySettings();
// Do not await `applySettings`. Otherwise this opens up a window of
// time where the user can still "Cancel" the bootstrap.
// We are calling `applySettings` just to be on the safe side, but the
// settings we are passing now should be exactly the same we already
// passed earlier.
TorSettings.applySettings().catch(e =>
lazy.logger.error("TorSettings.applySettings threw unexpectedly.", e)
);
this.changeState(TorConnectState.Bootstrapped);
return;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment