Implemented new hardware components "Active" on machine operator upload hardware configuration.

Improved and tested global exception trapper on async task.

Fixed a weird  issue on navigation control toAnimation complete's twice.

1 files changed, 3 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.Logging/GlobalExceptionTrapper.cs b/Software/Visual_Studio/Tango.Logging/GlobalExceptionTrapper.cs
index 5b917992e..5ee714cb6 100644
--- a/Software/Visual_Studio/Tango.Logging/GlobalExceptionTrapper.cs
+++ b/Software/Visual_Studio/Tango.Logging/GlobalExceptionTrapper.cs
@@ -15,7 +15,7 @@ namespace Tango.Logging
     /// <seealso cref="Tango.Logging.IGlobalExceptionTrapper" />
     public class WpfGlobalExceptionTrapper : IGlobalExceptionTrapper
     {
-        private DateTime _lastGlobalExceptionTime = DateTime.Now;
+        private DateTime _lastGlobalExceptionTime = DateTime.Now.AddMinutes(-1);
 
         /// <summary>
         /// Occurs when the global exception trapper has detected an unhandled exception.
@@ -81,8 +81,9 @@ namespace Tango.Logging
         /// <param name="error">The error.</param>
         private bool OnApplicationCrash(Exception exception)
         {
-            if (DateTime.Now - _lastGlobalExceptionTime > TimeSpan.FromSeconds(1))
+            if (DateTime.Now < _lastGlobalExceptionTime.AddSeconds(1))
             {
+                LogManager.Default.Log(exception, LogCategory.Critical);
                 _lastGlobalExceptionTime = DateTime.Now;
                 return true;
             }