From 4485fddecebd2178349ad386cda7b9d0b0a9468f Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Tue, 8 May 2012 22:37:54 +0800 Subject: [PATCH] APM Planner 1.1.83 fix null exception. if connect and not view the link stats, an exception is thrown on disconnect. --- Tools/ArdupilotMegaPlanner/MainV2.cs | 7 +- Tools/ArdupilotMegaPlanner/Msi/installer.wxs | 413 +++++++++--------- .../Properties/AssemblyInfo.cs | 2 +- 3 files changed, 215 insertions(+), 207 deletions(-) diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs index a7b4a603a5..a83f94353e 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.cs @@ -610,7 +610,12 @@ namespace ArdupilotMega // now that we have closed the connection, cancel the connection stats // so that the 'time connected' etc does not grow, but the user can still // look at the now frozen stats on the still open form - ((ConnectionStats)this.connectionStatsForm.Controls[0]).StopUpdates(); + try + { + // if terminal is used, then closed using this button.... exception + ((ConnectionStats)this.connectionStatsForm.Controls[0]).StopUpdates(); + } + catch { } this.MenuConnect.BackgroundImage = global::ArdupilotMega.Properties.Resources.connect; } diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index ef32e135d0..728954da4e 100644 --- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs +++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs @@ -2,14 +2,14 @@ - + - - + + @@ -31,231 +31,233 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + - - - + + + + + + + - - - - - - + + + - - - + + + + + + - - - + + + - - - + + + + + + + + @@ -297,27 +299,28 @@ - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + @@ -338,7 +341,7 @@ - +