Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 9 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index b4b1c5153..52602e6de 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -18,6 +18,8 @@ using Tango.MachineStudio.Common;
 using Tango.Settings;
 using System.Windows;
 using Tango.Integration.Services;
+using Tango.MachineStudio.Common.EventLogging;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
@@ -189,6 +191,13 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     LogManager.Log(ex, "Error disconnecting from machine.");
                 }
 
+                var eventLogger = ServiceLocator.Current.GetInstance<IEventLogger>();
+                if (eventLogger != null)
+                {
+                    eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!");
+                    eventLogger.FlushAll();
+                }
+
                 Thread.Sleep(1500);
 
                 Environment.Exit(0);