diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index fe941cd48..6a74fe868 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit fe941cd4811b11d83db6690e7492555daf9657c6 +Subproject commit 6a74fe868f40fb51ea516c9cb64936e81c3523db diff --git a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs index 684e3ca49..b7d10f407 100644 --- a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs +++ b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs @@ -62,14 +62,19 @@ public sealed class PluginsViewModel : ViewModelBase CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand); // TODO: Takes too much time - foreach(IFilter filter in GetPluginBase.Instance.Filters.Values) + foreach(Type filterType in GetPluginBase.Instance.Filters.Values) + { + if(Activator.CreateInstance(filterType) is not IFilter filter) + continue; + Filters.Add(new PluginModel { Name = filter.Name, Uuid = filter.Id, - Version = Assembly.GetAssembly(filter.GetType())?.GetName().Version?.ToString(), + Version = Assembly.GetAssembly(filterType)?.GetName().Version?.ToString(), Author = filter.Author }); + } foreach(IFloppyImage floppyImage in GetPluginBase.Instance.FloppyImages.Values) FloppyImages.Add(new PluginModel