Rename to TerminateTorOnExit
MODIFY
WalletWasabi.Gui/Config.cs
WalletWasabi.Gui/Config.cs
@@ -71,8 +71,8 @@ namespace WalletWasabi.Gui
public bool UseTor { get; internal set; }
[DefaultValue(false)]
- [JsonProperty(PropertyName = "CloseTor", DefaultValueHandling = DefaultValueHandling.Populate)]
- public bool CloseTor { get; internal set; }
+ [JsonProperty(PropertyName = "TerminateTorOnExit", DefaultValueHandling = DefaultValueHandling.Populate)]
+ public bool TerminateTorOnExit { get; internal set; }
[DefaultValue(false)]
[JsonProperty(PropertyName = "StartLocalBitcoinCoreOnStartup", DefaultValueHandling = DefaultValueHandling.Populate)]

MODIFY
WalletWasabi.Gui/Global.cs
WalletWasabi.Gui/Global.cs
@@ -759,7 +759,7 @@ namespace WalletWasabi.Gui
var torManager = TorManager;
if (torManager is { })
{
- await torManager.StopAsync(Config.CloseTor).ConfigureAwait(false);
+ await torManager.StopAsync(Config.TerminateTorOnExit).ConfigureAwait(false);
Logger.LogInfo($"{nameof(TorManager)} is stopped.");
}

MODIFY
WalletWasabi.Gui/Tabs/SettingsView.xaml
WalletWasabi.Gui/Tabs/SettingsView.xaml
</TextBox>
</StackPanel>
<StackPanel Margin="0 10" Orientation="Horizontal" Spacing="5" IsVisible="{Binding UseTor}">
- <ToggleButton IsChecked="{Binding CloseTor}" Content="{Binding CloseTor, Converter={StaticResource BooleanStringConverter}, ConverterParameter=On:Off}" Margin="0 0 10 0" />
- <TextBlock VerticalAlignment="Center">Close Tor instance after quit.</TextBlock>
+ <ToggleButton IsChecked="{Binding TerminateTorOnExit}" Content="{Binding TerminateTorOnExit, Converter={StaticResource BooleanStringConverter}, ConverterParameter=On:Off}" Margin="0 0 10 0" />
+ <TextBlock VerticalAlignment="Center">Terminate Tor process on exit.</TextBlock>
</StackPanel>
</StackPanel>
</controls:GroupBox>

MODIFY
WalletWasabi.Gui/Tabs/SettingsViewModel.cs
WalletWasabi.Gui/Tabs/SettingsViewModel.cs
@@ -35,7 +35,7 @@ namespace WalletWasabi.Gui.Tabs
private bool _startLocalBitcoinCoreOnStartup;
private bool _stopLocalBitcoinCoreOnShutdown;
private bool _isModified;
- private bool _closeTor;
+ private bool _terminateTorOnExit;
private string _somePrivacyLevel;
private string _finePrivacyLevel;
private string _strongPrivacyLevel;
@@ -65,7 +65,7 @@ namespace WalletWasabi.Gui.Tabs
Network = config.Network;
TorSocks5EndPoint = config.TorSocks5EndPoint.ToString(-1);
UseTor = config.UseTor;
- CloseTor = config.CloseTor;
+ TerminateTorOnExit = config.TerminateTorOnExit;
StartLocalBitcoinCoreOnStartup = config.StartLocalBitcoinCoreOnStartup;
StopLocalBitcoinCoreOnShutdown = config.StopLocalBitcoinCoreOnShutdown;
@@ -83,7 +83,7 @@ namespace WalletWasabi.Gui.Tabs
this.WhenAnyValue(
x => x.Network,
x => x.UseTor,
- x => x.CloseTor,
+ x => x.TerminateTorOnExit,
x => x.StartLocalBitcoinCoreOnStartup,
x => x.StopLocalBitcoinCoreOnShutdown)
.ObserveOn(RxApp.TaskpoolScheduler)
@@ -254,10 +254,10 @@ namespace WalletWasabi.Gui.Tabs
set => this.RaiseAndSetIfChanged(ref _useTor, value);
}
- public bool CloseTor
+ public bool TerminateTorOnExit
{
- get => _closeTor;
- set => this.RaiseAndSetIfChanged(ref _closeTor, value);
+ get => _terminateTorOnExit;
+ set => this.RaiseAndSetIfChanged(ref _terminateTorOnExit, value);
}
public string SomePrivacyLevel
@@ -372,7 +372,7 @@ namespace WalletWasabi.Gui.Tabs
config.SetP2PEndpoint(p2pEp);
}
config.UseTor = UseTor;
- config.CloseTor = CloseTor;
+ config.TerminateTorOnExit = TerminateTorOnExit;
config.StartLocalBitcoinCoreOnStartup = StartLocalBitcoinCoreOnStartup;
config.StopLocalBitcoinCoreOnShutdown = StopLocalBitcoinCoreOnShutdown;
config.LocalBitcoinCoreDataDir = Guard.Correct(LocalBitcoinCoreDataDir);

Rename to TerminateTorOnExit