Skip to content

Commit 54979b7

Browse files
committed
Fix Uninstall
Fixed the path to the dnscrypt-proxy files
1 parent 0faaa70 commit 54979b7

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Uninstall/Program.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using System;
1+
using Microsoft.Win32;
2+
using System;
23
using System.Collections.Generic;
34
using System.Configuration;
45
using System.Diagnostics;
56
using System.IO;
67
using System.Net.NetworkInformation;
78
using System.Threading;
8-
using Microsoft.Win32;
99

1010
namespace Uninstall
1111
{
@@ -38,7 +38,7 @@ internal static void BackupConfigurationFile()
3838
{
3939
try
4040
{
41-
var sdcConfig = Path.Combine(Directory.GetCurrentDirectory(), "SimpleDnsCrypt.exe.config");
41+
var sdcConfig = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SimpleDnsCrypt.exe.config");
4242
if (!File.Exists(sdcConfig)) return;
4343
var sdcConfigMap = new ExeConfigurationFileMap
4444
{
@@ -51,7 +51,7 @@ internal static void BackupConfigurationFile()
5151
var setting = section.Settings.Get("BackupAndRestoreConfigOnUpdate");
5252
var backupAndRestoreConfigOnUpdate = Convert.ToBoolean(setting.Value.ValueXml.LastChild.InnerText);
5353
if (!backupAndRestoreConfigOnUpdate) return;
54-
var config = Path.Combine(Directory.GetCurrentDirectory(), DnsCryptProxyFolder,
54+
var config = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, DnsCryptProxyFolder,
5555
DnsCryptProxyConfigName);
5656
if (!File.Exists(config)) return;
5757
var tmp = Path.Combine(Path.GetTempPath(), DnsCryptProxyConfigName + ".bak");
@@ -90,7 +90,8 @@ internal static void ExecuteWithArguments(string arguments)
9090
const int timeout = 9000;
9191
using (var process = new Process())
9292
{
93-
process.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), DnsCryptProxyFolder, DnsCryptProxyExecutableName);
93+
process.StartInfo.FileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
94+
DnsCryptProxyFolder, DnsCryptProxyExecutableName);
9495
process.StartInfo.Arguments = arguments;
9596
process.StartInfo.UseShellExecute = false;
9697
process.StartInfo.CreateNoWindow = true;

Uninstall/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
[assembly: AssemblyCulture("")]
1212
[assembly: ComVisible(false)]
1313
[assembly: Guid("1a9ca4fe-bdd5-4d7c-a86a-7ed503974718")]
14-
[assembly: AssemblyVersion("0.2.3")]
15-
[assembly: AssemblyFileVersion("0.2.3")]
14+
[assembly: AssemblyVersion("0.2.4")]
15+
[assembly: AssemblyFileVersion("0.2.4")]

0 commit comments

Comments
 (0)