WinGui: (WPF) Wiring up the Subtitles Auto-selection and Point-to-Point on the main window.

Also fixed the subtitles key defaults.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4494 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 6 insertions, 1 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
index 9ad24a1f9..c15b9db02 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
@@ -82,7 +82,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         {

             get

             {

-                return this.SrtFileName != "-";

+                return this.SrtFileName != "-" && this.SrtFileName != null;

             }

         }

 

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 91d4d5357..a018c9900 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -416,6 +416,11 @@ namespace HandBrake.ApplicationServices.Utilities
         /// </param>

         public static void Export(string path, Preset preset)

         {

+            if (string.IsNullOrEmpty(path))

+            {

+                return;

+            }

+

             EncodeTask parsed = QueryParserUtility.Parse(preset.Query);

             XmlTextWriter xmlWriter = new XmlTextWriter(path, Encoding.UTF8) { Formatting = Formatting.Indented };