Windows fixes for RC

hilts-vaughan · Nov 27, 2016 · 0875ef2 · 0875ef2
1 parent 082fef8
commit 0875ef2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/UnlinkMKV-GUI/UnlinkMKV-GUI/FormApplication.cs b/UnlinkMKV-GUI/UnlinkMKV-GUI/FormApplication.cs
@@ -290,7 +290,7 @@ public void Persist(string fileName) {
             var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
             using (var writer = new StreamWriter(fs)) {
                 foreach (var entry in _values) {
-                    string lineEntry = String.Format("{0} = {1}", entry.Key, entry.Value);
+                    string lineEntry = string.Format("{0} = {1}", entry.Key, entry.Value);
                     writer.WriteLine(lineEntry);
                 }
             }

diff --git a/UnlinkMKV-GUI/UnlinkMKV-GUI/Valdiators/Validators.cs b/UnlinkMKV-GUI/UnlinkMKV-GUI/Valdiators/Validators.cs
@@ -22,6 +22,7 @@ public bool IsRequirementMet()
                 PathUtility.FindExePath("mkvextract.exe");
                 PathUtility.FindExePath("mkvinfo.exe");
                 PathUtility.FindExePath("mkvmerge.exe");
+                PathUtility.FindExePath("mediainfo.exe");
             }
             catch (FileNotFoundException exception)
             {
@@ -113,6 +114,7 @@ public bool AttemptFixRequirement()
         }
     }
 
+
     public class PerlExistsValidatorTask : IValidatorTask
     {
         public string GetStatusText()
@@ -126,7 +128,6 @@ public bool IsRequirementMet()
             try
             {
 
-
                 PathUtility.FindExePath("perl.exe");
             }
             catch (FileNotFoundException exception)

diff --git a/UnlinkMKV-GUI/UnlinkMKV-GUI/merge/info/MkvToolNixMkvInfoLoaderStrategy.cs b/UnlinkMKV-GUI/UnlinkMKV-GUI/merge/info/MkvToolNixMkvInfoLoaderStrategy.cs
@@ -18,9 +18,9 @@ public MkvInfo FetchMkvInfo(string file)
             }
 
             proc.Start();
+            var data = proc.StandardOutput.ReadToEnd();
             proc.WaitForExit();
 
-            var data = proc.StandardOutput.ReadToEnd();
             var mapper = new XmlMkvInfoSummaryMapper();
             var doc = mapper.DecodeStringIntoDocument(data);
 
@@ -32,8 +32,8 @@ public MkvInfo FetchMkvInfo(string file)
             };
 
             mediaInfoProc.Start();
-            mediaInfoProc.WaitForExit();
             var mediaInfoStr = mediaInfoProc.StandardOutput.ReadToEnd();
+            mediaInfoProc.WaitForExit();
 
             // mediainfo > file > duration... weird format
             var mkvInfo = new MkvInfo(doc) {Duration = TimeCodeUtil.TimeCodeToTimespan(mediaInfoStr)};