WinGUI:

If Chapter Markers is checked, GUI now sets .m4v extension when user clicks the "browse" button in the destination box. Previously it would default to mp4 if you changed the file save location after having checked Chapters Markers.

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

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 3f89dee64959941ad245985212ad6a6053c09739..157ff5ccea1e797df3dd41fcf8075dde770b3b7c 100644 (file)
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -2304,7 +2304,7 @@ Partial Class frmMain
         'DVD_Save\r
         '\r
         Me.DVD_Save.DefaultExt = "mp4"\r
-        Me.DVD_Save.Filter = "mp4|*.mp4 |avi|*.avi |ogm|*.ogm"\r
+        Me.DVD_Save.Filter = "mp4|*.mp4 |m4v|*.m4v |avi|*.avi |ogm|*.ogm"\r
         '\r
         'File_Save\r
         '\r

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 9ecb13cc3659d173be41e60365895e612bdf8153..417f07b55e64da19c1dc1b081b5a6986ea13647e 100644 (file)
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -434,6 +434,11 @@ Public Class frmMain
         Dim filename As String\r
         DVD_Save.ShowDialog()\r
         filename = DVD_Save.FileName\r
+\r
+        If Check_ChapterMarkers.CheckState = 1 Then\r
+            filename = filename.Replace(".mp4", ".m4v").Trim()\r
+        End If\r
+\r
         text_destination.Text = filename.Trim\r
         Dim DriveLetter() As String = text_destination.Text.Split(":")\r
 \r
@@ -461,7 +466,10 @@ Public Class frmMain
         Catch ex As Exception\r
             ' Ignore the Error - Change this to an IF Statment at some point so it works better.\r
         End Try\r
+\r
         \r
+\r
+\r
     End Sub\r
 \r
     Private Sub GenerateQuery_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles GenerateQuery.Click\r