mirror of
https://github.com/Artemis-RGB/Artemis
synced 2025-12-12 21:38:38 +00:00
Merge branch 'development' of github.com:Artemis-RGB/Artemis into development
This commit is contained in:
commit
d2afc77bb8
@ -167,7 +167,7 @@ public class ProfileCategory : CorePropertyChanged, IStorageModel
|
|||||||
IsSuspended = Entity.IsSuspended;
|
IsSuspended = Entity.IsSuspended;
|
||||||
Order = Entity.Order;
|
Order = Entity.Order;
|
||||||
|
|
||||||
ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).ToList());
|
ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).OrderBy(pc => pc.Order).ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@ -180,7 +180,10 @@ public class ProfileCategory : CorePropertyChanged, IStorageModel
|
|||||||
|
|
||||||
Entity.ProfileConfigurations.Clear();
|
Entity.ProfileConfigurations.Clear();
|
||||||
foreach (ProfileConfiguration profileConfiguration in ProfileConfigurations)
|
foreach (ProfileConfiguration profileConfiguration in ProfileConfigurations)
|
||||||
|
{
|
||||||
|
profileConfiguration.Save();
|
||||||
Entity.ProfileConfigurations.Add(profileConfiguration.Entity);
|
Entity.ProfileConfigurations.Add(profileConfiguration.Entity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@ -59,7 +59,7 @@
|
|||||||
<PackageVersion Include="Splat.DryIoc" Version="15.1.1" />
|
<PackageVersion Include="Splat.DryIoc" Version="15.1.1" />
|
||||||
<PackageVersion Include="StrawberryShake.Server" Version="13.9.6" />
|
<PackageVersion Include="StrawberryShake.Server" Version="13.9.6" />
|
||||||
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.2" />
|
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.2" />
|
||||||
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
|
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
|
||||||
<PackageVersion Include="TextMateSharp.Grammars" Version="1.0.57" />
|
<PackageVersion Include="TextMateSharp.Grammars" Version="1.0.57" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Loading…
x
Reference in New Issue
Block a user