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

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
index b9ecca97dd96a744d54422edb0c0f5ac5abefba5..1c688e79e8a43b4dd95d81ca1479df14df754bb0 100644 (file)
--- 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
         {\r
             get\r
             {\r
-                return this.ScannedTrack.ToString();\r
+                return this.ScannedTrack == null ? string.Empty : this.ScannedTrack.ToString();\r
             }\r
         }\r
 \r

diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs
index c84dc6b62ed7cc2c9312732177b090be8095ed54..3ef2755df9efeea93b049f3dbbbe292f6693cf19 100644 (file)
--- a/win/CS/frmMain.Designer.cs
+++ b/win/CS/frmMain.Designer.cs
@@ -287,7 +287,7 @@ namespace Handbrake
             this.check_turbo.Enabled = false;\r
             this.check_turbo.Location = new System.Drawing.Point(495, 134);\r
             this.check_turbo.Name = "check_turbo";\r
-            this.check_turbo.Size = new System.Drawing.Size(101, 17);\r
+            this.check_turbo.Size = new System.Drawing.Size(99, 17);\r
             this.check_turbo.TabIndex = 9;\r
             this.check_turbo.Text = "Turbo first Pass";\r
             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
@@ -557,7 +557,7 @@ namespace Handbrake
             this.radio_cq.BackColor = System.Drawing.Color.Transparent;\r
             this.radio_cq.Location = new System.Drawing.Point(366, 37);\r
             this.radio_cq.Name = "radio_cq";\r
-            this.radio_cq.Size = new System.Drawing.Size(110, 17);\r
+            this.radio_cq.Size = new System.Drawing.Size(105, 17);\r
             this.radio_cq.TabIndex = 3;\r
             this.radio_cq.Text = "Constant Quality:";\r
             this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip"));\r
@@ -571,7 +571,7 @@ namespace Handbrake
             this.radio_avgBitrate.Checked = true;\r
             this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108);\r
             this.radio_avgBitrate.Name = "radio_avgBitrate";\r
-            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);\r
+            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);\r
             this.radio_avgBitrate.TabIndex = 4;\r
             this.radio_avgBitrate.TabStop = true;\r
             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";\r
@@ -585,7 +585,7 @@ namespace Handbrake
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
             this.check_2PassEncode.Location = new System.Drawing.Point(385, 134);\r
             this.check_2PassEncode.Name = "check_2PassEncode";\r
-            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);\r
+            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);\r
             this.check_2PassEncode.TabIndex = 10;\r
             this.check_2PassEncode.Text = "2-Pass Encoding";\r
             this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip"));\r
@@ -873,7 +873,7 @@ namespace Handbrake
             this.radio_constantFramerate.Checked = true;\r
             this.radio_constantFramerate.Location = new System.Drawing.Point(0, 0);\r
             this.radio_constantFramerate.Name = "radio_constantFramerate";\r
-            this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17);\r
+            this.radio_constantFramerate.Size = new System.Drawing.Size(117, 17);\r
             this.radio_constantFramerate.TabIndex = 17;\r
             this.radio_constantFramerate.TabStop = true;\r
             this.radio_constantFramerate.Text = "Constant Framerate";\r
@@ -885,7 +885,7 @@ namespace Handbrake
             this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent;\r
             this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23);\r
             this.radio_peakAndVariable.Name = "radio_peakAndVariable";\r
-            this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17);\r
+            this.radio_peakAndVariable.Size = new System.Drawing.Size(113, 17);\r
             this.radio_peakAndVariable.TabIndex = 19;\r
             this.radio_peakAndVariable.Text = "Variable Framerate";\r
             this.radio_peakAndVariable.UseVisualStyleBackColor = false;\r

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index b0c9fb298f81fbdeb09e5d84e6847ebe3f396717..51678516bee0ac53b3650bc179fa24c00335c5a3 100644 (file)
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -610,7 +610,6 @@ namespace Handbrake
 \r
         private void BtnRemovePreset_Click(object sender, EventArgs e)\r
         {\r
-            throw new Exception();\r
             if (treeView_presets.SelectedNode == null)\r
             {\r
                 return;\r