Profile editor - Fixed some race conditions with active module override

This commit is contained in:
SpoinkyNL committed 2020-08-25 20:40:19 +02:00
1 parent ccd04494f4
commit 0beae810ea
4 files changed
+66 -37

No files matched your search

@@ -270,6 +270,9 @@ namespace Artemis.UI.Screens.ProfileEditor
{
Execute.PostToUIThread(async () =>
{
if (SelectedProfile == null)
return;
var changeTask = _profileService.ActivateProfileAnimated(SelectedProfile);
_profileEditorService.ChangeSelectedProfile(null);
var profile = await changeTask;
@@ -279,7 +282,10 @@ namespace Artemis.UI.Screens.ProfileEditor
private void ModuleOnActiveProfileChanged(object sender, EventArgs e)
{
SelectedProfile = Profiles.FirstOrDefault(d => d.Id == Module.ActiveProfile.EntityId);
if (Module.ActiveProfile == null)
SelectedProfile = null;
else
SelectedProfile = Profiles.FirstOrDefault(d => d.Id == Module.ActiveProfile.EntityId);
}
private void LoadWorkspaceSettings()