diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs index 91b12ce..60415a6 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs @@ -81,7 +81,7 @@ namespace FileConverter.ConversionJobs break; case OutputType.Jpg: - image.Quality = 100; + image.Quality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality); break; default: diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index 079b3aa..9541f59 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -356,6 +356,11 @@ namespace FileConverter { string settingsValue = this.GetSettingsValue(settingsKey); + if (settingsValue == null) + { + return default(T); + } + Type type = typeof(T); if (type.IsEnum) { @@ -519,9 +524,10 @@ namespace FileConverter break; case OutputType.Jpg: - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "25"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "90"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0"); break; case OutputType.Avi: diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml index e71acbe..2a02633 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml +++ b/Application/FileConverter/Windows/SettingsWindow.xaml @@ -239,7 +239,7 @@