WinGui:

- Perform source scanning in the main window rather than a separate window. File Menu > Cancel Scan added in case of a scan lockup.
- Fixed issue where a preset was loaded twice needlessly. 
- Support for no audio added.

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

1 files changed, 11 insertions, 7 deletions

diff --git a/win/C#/frmMain/PresetLoader.cs b/win/C#/frmMain/PresetLoader.cs
index aa05cc876..ab4561c71 100644
--- a/win/C#/frmMain/PresetLoader.cs
+++ b/win/C#/frmMain/PresetLoader.cs
@@ -216,13 +216,17 @@ namespace Handbrake
             mainWindow.lv_audioList.Items.Clear();

 

             // Create a new row for the Audio list based on the currently selected items in the dropdown.

-            ListViewItem newTrack = new ListViewItem("Automatic");

-            newTrack.SubItems.Add(presetQuery.AudioEncoder1);

-            newTrack.SubItems.Add(presetQuery.AudioTrackMix1);

-            newTrack.SubItems.Add(presetQuery.AudioSamplerate1);

-            newTrack.SubItems.Add(presetQuery.AudioBitrate1);

-            newTrack.SubItems.Add(presetQuery.DRC1.ToString());

-            mainWindow.lv_audioList.Items.Add(newTrack);

+            ListViewItem newTrack;

+            if (presetQuery.AudioTrack1 != "None")

+            {

+                newTrack = new ListViewItem("Automatic");

+                newTrack.SubItems.Add(presetQuery.AudioEncoder1);

+                newTrack.SubItems.Add(presetQuery.AudioTrackMix1);

+                newTrack.SubItems.Add(presetQuery.AudioSamplerate1);

+                newTrack.SubItems.Add(presetQuery.AudioBitrate1);

+                newTrack.SubItems.Add(presetQuery.DRC1.ToString());

+                mainWindow.lv_audioList.Items.Add(newTrack);

+            }

 

             if (presetQuery.AudioTrack2 != "None")

             {