diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index 6a74fe868..84f759b01 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit 6a74fe868f40fb51ea516c9cb64936e81c3523db +Subproject commit 84f759b015b01b10750815691ce59922dd1a9eec diff --git a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs index b7d10f407..000ffb3b6 100644 --- a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs @@ -76,7 +76,11 @@ public sealed class PluginsViewModel : ViewModelBase }); } - foreach(IFloppyImage floppyImage in GetPluginBase.Instance.FloppyImages.Values) + foreach(Type imageType in GetPluginBase.Instance.FloppyImages.Values) + { + if(Activator.CreateInstance(imageType) is not IFloppyImage floppyImage) + continue; + FloppyImages.Add(new PluginModel { Name = floppyImage.Name, @@ -84,6 +88,7 @@ public sealed class PluginsViewModel : ViewModelBase Version = Assembly.GetAssembly(floppyImage.GetType())?.GetName().Version?.ToString(), Author = floppyImage.Author }); + } foreach(Type imageType in GetPluginBase.Instance.MediaImages.Values) {