WinGui:

- 2 Exceptions fixed. (Removing a preset failed and After scan, audio panel would crash)


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

3 files changed, 7 insertions, 8 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
index b9ecca97d..1c688e79e 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
@@ -83,7 +83,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         {

             get

             {

-                return this.ScannedTrack.ToString();

+                return this.ScannedTrack == null ? string.Empty : this.ScannedTrack.ToString();

             }

         }

 

diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs
index c84dc6b62..3ef2755df 100644
--- a/win/CS/frmMain.Designer.cs
+++ b/win/CS/frmMain.Designer.cs
@@ -287,7 +287,7 @@ namespace Handbrake
             this.check_turbo.Enabled = false;

             this.check_turbo.Location = new System.Drawing.Point(495, 134);

             this.check_turbo.Name = "check_turbo";

-            this.check_turbo.Size = new System.Drawing.Size(101, 17);

+            this.check_turbo.Size = new System.Drawing.Size(99, 17);

             this.check_turbo.TabIndex = 9;

             this.check_turbo.Text = "Turbo first Pass";

             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");

@@ -557,7 +557,7 @@ namespace Handbrake
             this.radio_cq.BackColor = System.Drawing.Color.Transparent;

             this.radio_cq.Location = new System.Drawing.Point(366, 37);

             this.radio_cq.Name = "radio_cq";

-            this.radio_cq.Size = new System.Drawing.Size(110, 17);

+            this.radio_cq.Size = new System.Drawing.Size(105, 17);

             this.radio_cq.TabIndex = 3;

             this.radio_cq.Text = "Constant Quality:";

             this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip"));

@@ -571,7 +571,7 @@ namespace Handbrake
             this.radio_avgBitrate.Checked = true;

             this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108);

             this.radio_avgBitrate.Name = "radio_avgBitrate";

-            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);

+            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);

             this.radio_avgBitrate.TabIndex = 4;

             this.radio_avgBitrate.TabStop = true;

             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";

@@ -585,7 +585,7 @@ namespace Handbrake
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;

             this.check_2PassEncode.Location = new System.Drawing.Point(385, 134);

             this.check_2PassEncode.Name = "check_2PassEncode";

-            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);

+            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);

             this.check_2PassEncode.TabIndex = 10;

             this.check_2PassEncode.Text = "2-Pass Encoding";

             this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip"));

@@ -873,7 +873,7 @@ namespace Handbrake
             this.radio_constantFramerate.Checked = true;

             this.radio_constantFramerate.Location = new System.Drawing.Point(0, 0);

             this.radio_constantFramerate.Name = "radio_constantFramerate";

-            this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17);

+            this.radio_constantFramerate.Size = new System.Drawing.Size(117, 17);

             this.radio_constantFramerate.TabIndex = 17;

             this.radio_constantFramerate.TabStop = true;

             this.radio_constantFramerate.Text = "Constant Framerate";

@@ -885,7 +885,7 @@ namespace Handbrake
             this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent;

             this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23);

             this.radio_peakAndVariable.Name = "radio_peakAndVariable";

-            this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17);

+            this.radio_peakAndVariable.Size = new System.Drawing.Size(113, 17);

             this.radio_peakAndVariable.TabIndex = 19;

             this.radio_peakAndVariable.Text = "Variable Framerate";

             this.radio_peakAndVariable.UseVisualStyleBackColor = false;

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index b0c9fb298..51678516b 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -610,7 +610,6 @@ namespace Handbrake
 

         private void BtnRemovePreset_Click(object sender, EventArgs e)

         {

-            throw new Exception();

             if (treeView_presets.SelectedNode == null)

             {

                 return;