DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

UI - Don't kill/restart on shutdown when a debugger is attached

Browse Source 
Modules - Attempt to fix #478
This commit is contained in:
SpoinkyNL 2020-11-05 23:56:51 +01:00
parent 143dea4c4c
commit 925bedc0a6
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Artemis.Core/Services/ModuleService.cs
View File

@ -101,11 +101,14 @@ namespace Artemis.Core.Services
List<Task> tasks = new List<Task>(); List<Task> tasks = new List<Task>();
foreach (Module module in modules) foreach (Module module in modules)
{ {
bool shouldBeActivated = module.EvaluateActivationRequirements(); lock (module)
if (shouldBeActivated && !module.IsActivated) {
tasks.Add(ActivateModule(module)); bool shouldBeActivated = module.EvaluateActivationRequirements() && module.Enabled;
else if (!shouldBeActivated && module.IsActivated) if (shouldBeActivated && !module.IsActivated)
tasks.Add(DeactivateModule(module)); tasks.Add(ActivateModule(module));
else if (!shouldBeActivated && module.IsActivated)
tasks.Add(DeactivateModule(module));
}
} }
await Task.WhenAll(tasks); await Task.WhenAll(tasks);

8
src/Artemis.Core/Utilities/CurrentProcessUtilities.cs
View File

@ -16,8 +16,8 @@ namespace Artemis.Core
/// gracefully shut down /// gracefully shut down
/// </para> /// </para>
/// </summary> /// </summary>
/// <param name="delay">The delay in seconds after which to kill the application</param> /// <param name="delay">The delay in seconds after which to kill the application (ignored when a debugger is attached)</param>
/// <param name="restart">Whether or not to restart the application after shutdown</param> /// <param name="restart">Whether or not to restart the application after shutdown (ignored when a debugger is attached)</param>
public static void Shutdown(int delay, bool restart) public static void Shutdown(int delay, bool restart)
{ {
// Always kill the process after the delay has passed, with all the plugins a graceful shutdown cannot be guaranteed // Always kill the process after the delay has passed, with all the plugins a graceful shutdown cannot be guaranteed
@ -33,7 +33,9 @@ namespace Artemis.Core
CreateNoWindow = true, CreateNoWindow = true,
FileName = "PowerShell.exe" FileName = "PowerShell.exe"
}; };
Process.Start(info);
if (!Debugger.IsAttached)
Process.Start(info);
// Also attempt a graceful shutdown on the UI thread // Also attempt a graceful shutdown on the UI thread
Execute.OnUIThread(() => Application.Current.Shutdown()); Execute.OnUIThread(() => Application.Current.Shutdown());