WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / Main.cs

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 578d2e8..f78d38a 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -240,7 +240,7 @@ namespace Handbrake.Functions
                 // Add the appropriate file extension\r
                 if (mainWindow.drop_format.SelectedIndex == 0)\r
                 {\r
-                    destinationFilename += Properties.Settings.Default.useM4v || mainWindow.Check_ChapterMarkers.Checked ||\r
+                    destinationFilename += Properties.Settings.Default.useM4v == 0 || Properties.Settings.Default.useM4v == 2 || mainWindow.Check_ChapterMarkers.Checked ||\r
                                            mainWindow.AudioSettings.RequiresM4V() || mainWindow.Subtitles.RequiresM4V()\r
                                                ? ".m4v"\r
                                                : ".mp4";\r
@@ -295,7 +295,7 @@ namespace Handbrake.Functions
 \r
             // Get the SHA1 Hash of HandBrakeCLI\r
             byte[] hash;\r
-            using (Stream stream = File.OpenRead("HandBrakeCLI.exe"))\r
+            using (Stream stream = File.OpenRead(Path.Combine(Application.StartupPath, "HandBrakeCLI.exe")))\r
             {\r
                 hash = SHA1.Create().ComputeHash(stream);\r
             }\r