WinGui:

- Improve autoName reliability - Thanks exdeus

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

1 files changed, 5 insertions, 16 deletions

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index a668cc69e..b46b5aeab 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -723,7 +723,7 @@ namespace Handbrake
 

                         if (ActivityWindow != null)

                             ActivityWindow.SetLogView(false);

-                        

+

                     }

                     this.Focus();

                 }

@@ -861,18 +861,8 @@ namespace Handbrake
                 return;

             }

 

-            switch (type) // Start the scan

-            {

-                case 1: // btn_dvd_source_Click()

-                case 3: // mnu_dvd_drive_Click()

-                    sourcePath = Path.GetFullPath(file);

-                    startScan(file);

-                    break;

-                case 2: // btn_file_source_Click()

-                    sourcePath = Path.GetFileName(file);

-                    startScan(file);

-                    break;

-            }

+            sourcePath = Path.GetFileName(file);

+            startScan(file);

         }

         private void drp_dvdtitle_Click(object sender, EventArgs e)

         {

@@ -1127,9 +1117,8 @@ namespace Handbrake
                 else

                     newExtension = ".mp4";

 

-            text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);

-            text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);

-            text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);

+            if (Path.HasExtension(newExtension))

+                text_destination.Text = Path.ChangeExtension(text_destination.Text, newExtension);

         }

 

         //Video Tab