remove crf flag and all uses of it

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

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index fae48ee..3018b91 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -47,9 +47,19 @@ namespace Handbrake.Functions
             if (presetQuery.Format != null)\r
             {\r
                 if (presetQuery.Format == "mp4" || presetQuery.Format == "m4v")\r
-                    mainWindow.drop_format.SelectedIndex = 0;\r
+                {\r
+                    if (mainWindow.drop_format.SelectedIndex == 0)\r
+                        mainWindow.SetExtension(".mp4");\r
+                    else \r
+                        mainWindow.drop_format.SelectedIndex = 0;\r
+                }\r
                 else if (presetQuery.Format == "mkv")\r
-                    mainWindow.drop_format.SelectedIndex = 1;\r
+                {\r
+                    if(mainWindow.drop_format.SelectedIndex == 1)\r
+                        mainWindow.SetExtension(".mkv");\r
+                    else\r
+                        mainWindow.drop_format.SelectedIndex = 1;\r
+                }\r
             }\r
 \r
             mainWindow.check_iPodAtom.CheckState = presetQuery.IpodAtom ? CheckState.Checked : CheckState.Unchecked;\r
@@ -63,11 +73,9 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region Picture\r
-\r
+            mainWindow.PictureSettings.check_autoCrop.Checked = true;\r
             if (pictureSettings) // only Load picture settings if the perset requires it\r
             {\r
-                mainWindow.PictureSettings.check_autoCrop.Checked = true;\r
-\r
                 if (presetQuery.CropValues != null)\r
                 {\r
                     int top, bottom, left, right;\r