From 0967fc688af68462f04cebf99a30a59e6253266e Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 24 Nov 2018 12:53:19 +0000
Subject: [PATCH] WinGui: Trim some duplicate error messages on the main
 screen.

---
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj       |  1 +
 .../Properties/Resources.Designer.cs          | 18 ---------------
 win/CS/HandBrakeWPF/Properties/Resources.resx |  6 -----
 .../HandBrakeWPF/ViewModels/MainViewModel.cs  | 23 +------------------
 4 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 69a0322e1..db9dd3c32 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -736,6 +736,7 @@
       <Name>HandBrake.Interop</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 6d2bb0b4a..122d98087 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1366,15 +1366,6 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Please choose a destination for where you would like the encoded file to be saved..
-        /// </summary>
-        public static string Main_ChooseDestination {
-            get {
-                return ResourceManager.GetString("Main_ChooseDestination", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unable to add the last job to the queue. Do you wish to proceed trying to add the rest?.
         /// </summary>
@@ -1384,15 +1375,6 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to The current file already exists, do you wish to overwrite it?.
-        /// </summary>
-        public static string Main_DestinationOverwrite {
-            get {
-                return ResourceManager.GetString("Main_DestinationOverwrite", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to There are jobs on the queue with the same destination path. Please choose a different path for this job..
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 44e9ed3eb..127d9c598 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -337,12 +337,6 @@ Do you wish to continue?</value>
   <data name="Main_AlreadyEncoding" xml:space="preserve">
     <value>HandBrake is already encoding.</value>
   </data>
-  <data name="Main_ChooseDestination" xml:space="preserve">
-    <value>Please choose a destination for where you would like the encoded file to be saved.</value>
-  </data>
-  <data name="Main_DestinationOverwrite" xml:space="preserve">
-    <value>The current file already exists, do you wish to overwrite it?</value>
-  </data>
   <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
     <value>There are jobs on the queue with the same destination path. Please choose a different path for this job.</value>
   </data>
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 45904cb0e..bd7bc420d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1719,19 +1719,13 @@ namespace HandBrakeWPF.ViewModels
                 return;
             }
 
-            // Otherwise, perform Santiy Checking then add to the queue and start if everything is ok.
+            // Otherwise, perform Sanity Checking then add to the queue and start if everything is ok.
             if (this.SelectedTitle == null)
             {
                 this.errorService.ShowMessageBox(Resources.Main_ScanSource, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
 
-            if (string.IsNullOrEmpty(this.Destination))
-            {
-                this.errorService.ShowMessageBox(Resources.Main_ChooseDestination, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
             if (!DriveUtilities.HasMinimumDiskSpace(
                 this.Destination,
                 this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseOnLowDiskspaceLevel)))
@@ -1740,21 +1734,6 @@ namespace HandBrakeWPF.ViewModels
                 return;
             }
 
-            if (this.scannedSource != null && !string.IsNullOrEmpty(this.scannedSource.ScanPath) && this.Destination.ToLower() == this.scannedSource.ScanPath.ToLower())
-            {
-                this.errorService.ShowMessageBox(Resources.Main_MatchingFileOverwriteWarning, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            if (File.Exists(this.Destination))
-            {
-                MessageBoxResult result = this.errorService.ShowMessageBox(Resources.Main_DestinationOverwrite, Resources.Question, MessageBoxButton.YesNo, MessageBoxImage.Question);
-                if (result == MessageBoxResult.No)
-                {
-                    return;
-                }
-            }
-
             // Create the Queue Task and Start Processing
             if (this.AddToQueue())
             {
-- 
2.40.0