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

Modules - Attempt to fix #478
This commit is contained in:
SpoinkyNL committed 2020-11-05 23:56:51 +01:00
1 parent 143dea4c4c
commit 925bedc0a6
2 files changed
+13 -8

No files matched your search

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