Skip to content

Portable Tool for an Ideal Windows Setup

fix explorer restart race conditions

Greedeks65e1e07a41b5
diff --git a/.Source/GTweak/Utilities/Managers/ExplorerManager.cs b/.Source/GTweak/Utilities/Managers/ExplorerManager.cs
index bfd38bc0..98c2e093 100644
--- a/.Source/GTweak/Utilities/Managers/ExplorerManager.cs
+++ b/.Source/GTweak/Utilities/Managers/ExplorerManager.cs
@@ -53,42 +53,59 @@ namespace GTweak.Utilities.Managers
["Edge"] = ExplorerAction.Restart
};
- private static int _restartToken = 0;
+ private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+ private static readonly object _lockObj = new object();
+ private static CancellationTokenSource _restartDelayCts;
+ private static Action _pendingActions;
internal static void Restart(Action action = null)
{
- if (Interlocked.CompareExchange(ref _restartToken, 1, 0) != 1)
+ lock (_lockObj)
{
- Task.Run(async delegate
+ if (action != null)
{
- foreach (Process process in Process.GetProcesses())
+ _pendingActions += action;
+ }
+
+ _restartDelayCts?.Cancel();
+ _restartDelayCts = new CancellationTokenSource();
+ var token = _restartDelayCts.Token;
+
+ Task.Run(async () =>
+ {
+ try
{
+ await Task.Delay(500, token);
+ await _semaphore.WaitAsync(token);
+
try
{
- if (string.Compare(process.MainModule?.FileName, PathLocator.Executable.Explorer, StringComparison.OrdinalIgnoreCase) == 0 && Process.GetProcessesByName("explorer").Length != 0)
+ Action capturedActions;
+ lock (_lockObj)
{
- process.Kill();
- action?.Invoke();
- process.Dispose();
+ capturedActions = _pendingActions;
+ _pendingActions = null;
}
- }
- catch (Exception ex) { ErrorLogging.LogDebug(ex); }
- }
- if (Process.GetProcessesByName("explorer").Length == 0)
- {
- using Process launchExplorer = new Process();
- launchExplorer.StartInfo.FileName = PathLocator.Executable.Explorer;
- launchExplorer.StartInfo.Arguments = "/factory,{EFD469A7-7E0A-4517-8B39-45873948DA31}";
- launchExplorer.StartInfo.UseShellExecute = true;
- try { launchExplorer.Start(); }
- catch (Exception ex) { ErrorLogging.LogDebug(ex); }
- }
+ foreach (Process process in Process.GetProcessesByName("explorer"))
+ {
+ try { process.Kill(); }
+ finally { process.Dispose(); }
+ }
- await Task.Delay(1500);
+ try { capturedActions?.Invoke(); }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
- Interlocked.Exchange(ref _restartToken, 0);
- });
+ using Process launchExplorer = new Process();
+ launchExplorer.StartInfo.FileName = PathLocator.Executable.Explorer;
+ launchExplorer.StartInfo.Arguments = "/factory,{EFD469A7-7E0A-4517-8B39-45873948DA31}";
+ launchExplorer.StartInfo.UseShellExecute = true;
+ launchExplorer.Start();
+ }
+ finally { _semaphore.Release(); }
+ }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
+ }, token);
}
}