Skip to content

Commit d40a66a

Browse files
valnoxyvalnoxy
committed
Fixed silent uninstall bug
1 parent 3848a8b commit d40a66a

File tree

4 files changed

+23
-10
lines changed

4 files changed

+23
-10
lines changed

‎GoAwayEdge/App.xaml.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,21 @@ public void Application_Startup(object sender, StartupEventArgs e)
151151
return;
152152
}
153153

154+
Configuration.InstallControlPanel = true;
154155
Configuration.InitialEnvironment();
155156
var result = InstallRoutine.Install(null);
156157
Environment.Exit(result);
157158
}
158159
if (args.Contains("-u"))
159160
{
160-
InstallRoutine.Uninstall(null);
161-
Environment.Exit(0);
161+
if (IsAdministrator() == false)
162+
{
163+
ElevateAsAdmin(string.Join(" ", args));
164+
Environment.Exit(0);
165+
return;
166+
}
167+
var result = InstallRoutine.Uninstall(null);
168+
Environment.Exit(result);
162169
}
163170
if (args.Contains("--update"))
164171
{

‎GoAwayEdge/Common/Installation/InstallRoutine.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public static int Install(object? sender, DoWorkEventArgs? e = null)
238238
return 0;
239239
}
240240

241-
public static void Uninstall(object? sender, DoWorkEventArgs? e = null)
241+
public static int Uninstall(object? sender, DoWorkEventArgs? e = null)
242242
{
243243
var worker = sender as BackgroundWorker;
244244
Logging.Log("Start uninstallation ...");
@@ -261,15 +261,15 @@ public static void Uninstall(object? sender, DoWorkEventArgs? e = null)
261261
messageUi.ShowDialog();
262262
});
263263
Environment.Exit(1);
264-
return;
264+
return 1;
265265
}
266266
Process.Start(new ProcessStartInfo
267267
{
268268
FileName = Path.Combine(tempDir, "GoAwayEdge.exe"),
269269
Arguments = "-u",
270270
UseShellExecute = true
271271
});
272-
Environment.Exit(0);
272+
Environment.Exit(3010);
273273
}
274274

275275
// Remove installation directory
@@ -288,7 +288,7 @@ public static void Uninstall(object? sender, DoWorkEventArgs? e = null)
288288
messageUi.ShowDialog();
289289
});
290290
Environment.Exit(1);
291-
return;
291+
return 1;
292292
}
293293

294294
// Remove user directory
@@ -310,7 +310,7 @@ public static void Uninstall(object? sender, DoWorkEventArgs? e = null)
310310
messageUi.ShowDialog();
311311
});
312312
Environment.Exit(1);
313-
return;
313+
return 1;
314314
}
315315

316316
// Remove Ifeo & Uri handler from registry
@@ -359,7 +359,7 @@ public static void Uninstall(object? sender, DoWorkEventArgs? e = null)
359359
messageUi.ShowDialog();
360360
});
361361
Environment.Exit(1);
362-
return;
362+
return 1;
363363
}
364364

365365
// Clean up Task Scheduler
@@ -402,6 +402,7 @@ public static void Uninstall(object? sender, DoWorkEventArgs? e = null)
402402
worker?.ReportProgress(100, "");
403403
Logging.Log("Uninstallation finished.");
404404
Console.WriteLine("Uninstallation finished.");
405+
return 0;
405406
}
406407

407408
internal static bool CopyItself(string pathTo, bool overwrite = false)

‎GoAwayEdge/Properties/PublishProfiles/FolderProfile.pubxml.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project>
66
<PropertyGroup>
7-
<History>True|2024-12-26T14:09:04.1027404Z||;True|2024-12-26T15:03:19.0005711+01:00||;True|2024-12-25T17:22:09.8471194+01:00||;True|2024-08-13T19:39:30.3814052+02:00||;True|2024-08-13T19:35:07.3638159+02:00||;True|2024-08-13T01:10:27.4137217+02:00||;True|2024-08-13T01:06:17.9215774+02:00||;True|2024-08-13T00:56:54.4657665+02:00||;True|2024-08-13T00:49:21.1156303+02:00||;True|2024-08-13T00:45:56.3970427+02:00||;True|2024-08-13T00:25:23.5481220+02:00||;True|2024-08-12T22:11:19.4188626+02:00||;True|2024-08-12T22:10:38.2923046+02:00||;True|2024-08-12T22:08:45.6517147+02:00||;True|2024-07-30T00:22:22.2984409+02:00||;True|2024-07-30T00:18:17.4366719+02:00||;True|2024-07-30T00:17:49.8084336+02:00||;True|2024-07-22T18:41:59.8117684+02:00||;True|2024-06-18T00:28:22.3138517+02:00||;True|2024-06-18T00:16:46.9788815+02:00||;True|2024-06-09T20:14:23.6305404+02:00||;True|2024-06-09T19:02:49.2570274+02:00||;True|2024-06-09T18:47:29.9573023+02:00||;True|2024-06-09T18:46:39.8011527+02:00||;False|2024-06-09T18:46:05.6633541+02:00||;False|2024-06-09T18:45:59.2563619+02:00||;True|2024-02-18T17:16:27.0408261+01:00||;True|2024-02-18T17:15:41.3961034+01:00||;True|2024-02-18T17:11:58.7761728+01:00||;True|2024-02-18T17:08:57.9390623+01:00||;True|2024-02-18T17:08:26.6377454+01:00||;True|2024-02-18T17:07:45.2050537+01:00||;True|2024-02-18T17:05:12.7495146+01:00||;True|2024-02-18T17:02:32.4549017+01:00||;True|2024-02-18T16:48:25.3074382+01:00||;True|2023-10-19T00:00:28.0962969+02:00||;True|2022-11-13T02:33:03.7406004+01:00||;True|2022-11-13T02:19:07.9073988+01:00||;True|2022-11-13T02:18:35.3043045+01:00||;True|2022-11-12T20:05:07.6366825+01:00||;False|2022-11-12T20:04:52.3576134+01:00||;True|2022-11-12T19:36:12.8480978+01:00||;</History>
7+
<History>True|2024-12-26T14:22:32.4690057Z||;True|2024-12-26T15:09:04.1027404+01:00||;True|2024-12-26T15:03:19.0005711+01:00||;True|2024-12-25T17:22:09.8471194+01:00||;True|2024-08-13T19:39:30.3814052+02:00||;True|2024-08-13T19:35:07.3638159+02:00||;True|2024-08-13T01:10:27.4137217+02:00||;True|2024-08-13T01:06:17.9215774+02:00||;True|2024-08-13T00:56:54.4657665+02:00||;True|2024-08-13T00:49:21.1156303+02:00||;True|2024-08-13T00:45:56.3970427+02:00||;True|2024-08-13T00:25:23.5481220+02:00||;True|2024-08-12T22:11:19.4188626+02:00||;True|2024-08-12T22:10:38.2923046+02:00||;True|2024-08-12T22:08:45.6517147+02:00||;True|2024-07-30T00:22:22.2984409+02:00||;True|2024-07-30T00:18:17.4366719+02:00||;True|2024-07-30T00:17:49.8084336+02:00||;True|2024-07-22T18:41:59.8117684+02:00||;True|2024-06-18T00:28:22.3138517+02:00||;True|2024-06-18T00:16:46.9788815+02:00||;True|2024-06-09T20:14:23.6305404+02:00||;True|2024-06-09T19:02:49.2570274+02:00||;True|2024-06-09T18:47:29.9573023+02:00||;True|2024-06-09T18:46:39.8011527+02:00||;False|2024-06-09T18:46:05.6633541+02:00||;False|2024-06-09T18:45:59.2563619+02:00||;True|2024-02-18T17:16:27.0408261+01:00||;True|2024-02-18T17:15:41.3961034+01:00||;True|2024-02-18T17:11:58.7761728+01:00||;True|2024-02-18T17:08:57.9390623+01:00||;True|2024-02-18T17:08:26.6377454+01:00||;True|2024-02-18T17:07:45.2050537+01:00||;True|2024-02-18T17:05:12.7495146+01:00||;True|2024-02-18T17:02:32.4549017+01:00||;True|2024-02-18T16:48:25.3074382+01:00||;True|2023-10-19T00:00:28.0962969+02:00||;True|2022-11-13T02:33:03.7406004+01:00||;True|2022-11-13T02:19:07.9073988+01:00||;True|2022-11-13T02:18:35.3043045+01:00||;True|2022-11-12T20:05:07.6366825+01:00||;False|2022-11-12T20:04:52.3576134+01:00||;True|2022-11-12T19:36:12.8480978+01:00||;</History>
88
<LastFailureDetails />
99
</PropertyGroup>
1010
</Project>

‎GoAwayEdge/UserInterface/Setup/Pages/Installation.xaml.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public Installation()
1919
applyBackgroundWorker.WorkerSupportsCancellation = true;
2020
if (Configuration.Uninstall)
2121
{
22-
applyBackgroundWorker.DoWork += InstallRoutine.Uninstall;
22+
applyBackgroundWorker.DoWork += InstallRoutine_Uninstall;
2323
}
2424
else
2525
{
@@ -41,5 +41,10 @@ private static void InstallRoutine_Install(object? sender, DoWorkEventArgs e)
4141
{
4242
e.Result = InstallRoutine.Install(sender, e);
4343
}
44+
45+
private static void InstallRoutine_Uninstall(object? sender, DoWorkEventArgs e)
46+
{
47+
e.Result = InstallRoutine.Uninstall(sender, e);
48+
}
4449
}
4550
}

0 commit comments

Comments
 (0)