From: sr55 <sr55.hb@outlook.com>
Date: Fri, 18 May 2018 22:43:01 +0000 (+0100)
Subject: WinGui: Fix an issue with the Add preset window that prevented it from updating exist... 
X-Git-Tag: 1.1.1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1439c5d35179fcd1c4b73cedb3c61af586fa2a84;p=handbrake

WinGui: Fix an issue with the Add preset window that prevented it from updating existing non-built-in presets. #1333
---

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index a7d4dbefa..2182c082d 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -159,6 +159,12 @@ namespace HandBrakeWPF.Services.Presets
                 {
                     this.SavePresetFiles();
                 }
+
+                return true;
+            }
+            else
+            {
+                this.Update(preset);
                 return true;
             }
 
diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 398fff3c8..856c3e4bc 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -236,7 +236,14 @@ namespace HandBrakeWPF.ViewModels
 
             if (this.presetService.CheckIfPresetExists(this.Preset.Name))
             {
-                MessageBoxResult result = this.errorService.ShowMessageBox(Resources.AddPresetViewModel_PresetWithSameNameOverwriteWarning, Resources.Error, MessageBoxButton.YesNo, MessageBoxImage.Error);
+                Preset currentPreset = this.presetService.GetPreset(this.Preset.Name);
+                if (currentPreset != null && currentPreset.IsBuildIn)
+                {
+                    this.errorService.ShowMessageBox(Resources.Main_NoUpdateOfBuiltInPresets, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+                    return;
+                }
+
+                MessageBoxResult result = this.errorService.ShowMessageBox(Resources.AddPresetViewModel_PresetWithSameNameOverwriteWarning, Resources.Question, MessageBoxButton.YesNo, MessageBoxImage.Question);
                 if (result == MessageBoxResult.No)
                 {
                     return;
@@ -282,8 +289,11 @@ namespace HandBrakeWPF.ViewModels
             bool added = this.presetService.Add(this.Preset);
             if (!added)
             {
-                this.errorService.ShowMessageBox(Resources.AddPresetViewModel_UnableToAddPreset, Resources.UnknownError, MessageBoxButton.OK,
-                                                 MessageBoxImage.Error);
+                this.errorService.ShowMessageBox(
+                    Resources.AddPresetViewModel_UnableToAddPreset,
+                    Resources.UnknownError,
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error);
             }
             else
             {