WinGui:

- Fixes an issue where if there are no presets, that is, the user removed them all, then the GUI would throw a null pointer exception after scanning a source.

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

3 files changed, 19 insertions, 9 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index ebd065b65..e64cfadb0 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

@@ -323,6 +323,7 @@ namespace Handbrake
             // DVD_Save

             // 

             this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|avi|*.avi|ogm|*.ogm|mkv|*.mkv";

+            this.DVD_Save.SupportMultiDottedExtensions = true;

             // 

             // File_Save

             // 

@@ -652,9 +653,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            dataGridViewCellStyle3.Format = "N0";

+            dataGridViewCellStyle3.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle3;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 54a698f5e..f70643731 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -709,12 +709,15 @@ namespace Handbrake
                 drp_track1Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());

                 drp_track1Audio.SelectedIndex = 0;

 

-                if (!treeView_presets.SelectedNode.Text.Contains("AppleTV"))

+                if (treeView_presets.Nodes.Count != 0)

                 {

-                    drp_track2Audio.Items.Clear();

-                    drp_track2Audio.Items.Add("None");

-                    drp_track2Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());

-                    drp_track2Audio.SelectedIndex = 0;

+                    if (!treeView_presets.SelectedNode.Text.Contains("AppleTV"))

+                    {

+                        drp_track2Audio.Items.Clear();

+                        drp_track2Audio.Items.Add("None");

+                        drp_track2Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());

+                        drp_track2Audio.SelectedIndex = 0;

+                    }

                 }

 

                 drp_track3Audio.Items.Clear();

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 1ae5e6636..4601e5975 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,6 +155,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.

 Note: Do not change any of the chapter numbers!</value>

   </data>

+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>True</value>

+  </metadata>

+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>True</value>

+  </metadata>

   <data name="check_Cabac.ToolTip" xml:space="preserve">

     <value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15%. 

 This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod 5.5G, and makes the AppleTV struggle.