Merge branch 'development' into feature/workshop

This commit is contained in:
Robert committed 2023-08-09 11:58:37 +02:00
commit c6a318b6e3
10 files changed
+25 -40

No files matched your search

@@ -50,8 +50,8 @@ public partial class ProfileConfigurationIcon : UserControl, IDisposable
{
Dispatcher.UIThread.Post(() =>
{
Stream? stream = ConfigurationIcon.GetIconStream();
if (stream == null)
Stream? stream = ConfigurationIcon?.GetIconStream();
if (stream == null || ConfigurationIcon == null)
Content = new MaterialIcon {Kind = MaterialIconKind.QuestionMark};
else
LoadFromBitmap(ConfigurationIcon, stream);