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

2 files changed, 9 insertions, 1 deletions

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 3f89dee64..157ff5cce 100644
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -2304,7 +2304,7 @@ Partial Class frmMain
         'DVD_Save

         '

         Me.DVD_Save.DefaultExt = "mp4"

-        Me.DVD_Save.Filter = "mp4|*.mp4 |avi|*.avi |ogm|*.ogm"

+        Me.DVD_Save.Filter = "mp4|*.mp4 |m4v|*.m4v |avi|*.avi |ogm|*.ogm"

         '

         'File_Save

         '

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 9ecb13cc3..417f07b55 100644
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -434,6 +434,11 @@ Public Class frmMain
         Dim filename As String

         DVD_Save.ShowDialog()

         filename = DVD_Save.FileName

+

+        If Check_ChapterMarkers.CheckState = 1 Then

+            filename = filename.Replace(".mp4", ".m4v").Trim()

+        End If

+

         text_destination.Text = filename.Trim

         Dim DriveLetter() As String = text_destination.Text.Split(":")

 

@@ -461,7 +466,10 @@ Public Class frmMain
         Catch ex As Exception

             ' Ignore the Error - Change this to an IF Statment at some point so it works better.

         End Try

+

         

+

+

     End Sub

 

     Private Sub GenerateQuery_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles GenerateQuery.Click