diff --git a/Aaru.CommonTypes/PluginRegister.cs b/Aaru.CommonTypes/PluginRegister.cs
index 5b5628165..eb78040fe 100644
--- a/Aaru.CommonTypes/PluginRegister.cs
+++ b/Aaru.CommonTypes/PluginRegister.cs
@@ -64,13 +64,13 @@ public class PluginRegister
}
/// List of writable media image plugins
- public SortedDictionary WritableImages
+ public SortedDictionary WritableImages
{
get
{
- SortedDictionary mediaImages = new();
+ SortedDictionary mediaImages = new();
- foreach(IWritableImage plugin in _serviceProvider.GetServices())
+ foreach(IBaseWritableImage plugin in _serviceProvider.GetServices())
mediaImages[plugin.Name.ToLower()] = plugin;
return mediaImages;
diff --git a/Aaru.Core/ImageFormat.cs b/Aaru.Core/ImageFormat.cs
index 12a7583fe..0f12ec59e 100644
--- a/Aaru.Core/ImageFormat.cs
+++ b/Aaru.Core/ImageFormat.cs
@@ -31,7 +31,6 @@
// ****************************************************************************/
using System;
-using System.Linq;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
using Aaru.Logging;
@@ -55,7 +54,7 @@ public static class ImageFormat
IBaseImage imageFormat = null;
// Check all but RAW plugin
- foreach(IMediaImage imagePlugin in plugins.MediaImages.Values.Concat(plugins.WritableImages.Values))
+ foreach(IMediaImage imagePlugin in plugins.MediaImages.Values)
{
if(imagePlugin is null) continue;
@@ -107,7 +106,7 @@ public static class ImageFormat
if(imageFormat != null) return imageFormat;
// Check only RAW plugin
- foreach(IMediaImage imagePlugin in plugins.MediaImages.Values.Concat(plugins.WritableImages.Values))
+ foreach(IMediaImage imagePlugin in plugins.MediaImages.Values)
{
if(imagePlugin is null) continue;
diff --git a/Aaru/Commands/Formats.cs b/Aaru/Commands/Formats.cs
index 38107421d..2be9af8e7 100644
--- a/Aaru/Commands/Formats.cs
+++ b/Aaru/Commands/Formats.cs
@@ -132,7 +132,7 @@ sealed class FormatsCommand : Command
table = new Table
{
- Title = new TableTitle(string.Format(UI.Supported_filters_0, plugins.WritableImages.Count))
+ Title = new TableTitle(string.Format(UI.Read_write_media_image_formats_0, plugins.WritableImages.Count))
};
table.Border(TableBorder.Rounded);
@@ -144,7 +144,7 @@ sealed class FormatsCommand : Command
table.AddColumn(new TableColumn(new Markup(UI.Title_Media_image_format).Centered()));
- foreach(IWritableImage plugin in plugins.WritableImages.Values)
+ foreach(IBaseWritableImage plugin in plugins.WritableImages.Values)
{
if(plugin is null) continue;