Fixed several issues.

5 files changed, 34 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
index dec58f336..bf621ff2e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
@@ -116,6 +116,7 @@ namespace Tango.PPC.UI
 
         private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
+            e.Cancel = true;
             TangoIOC.Default.GetInstance<IPPCApplicationManager>().ShutDown();
         }
     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
index 8d3618fee..154ab68a1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
@@ -215,7 +215,11 @@ namespace Tango.PPC.UI.Navigation
                     return false;
                 }
 
-                if (path.Length == 1 && path[0] == CurrentModule.Name) return true;
+                if (path.Length == 1 && path[0] == CurrentModule.Name)
+                {
+                    IsNavigating = false;
+                    return true;
+                }
 
                 LogManager.Log($"Navigating to: {fullPath}...");
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index c28c683bd..54193a793 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -34,6 +34,7 @@ using Tango.PPC.Common.Messages;
 using Tango.Core.ExtensionMethods;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.Synchronization;
+using Tango.Insights;
 
 namespace Tango.PPC.UI.PPCApplication
 {
@@ -471,6 +472,13 @@ namespace Tango.PPC.UI.PPCApplication
             }
             catch { }
 
+            try
+            {
+                var frame = InsightsFrame.CreateEmpty(DateTime.UtcNow);
+                InsightsManager.Default.InsertFrame(frame);
+            }
+            catch {}
+
             Environment.Exit(0);
         }
 
@@ -516,6 +524,13 @@ namespace Tango.PPC.UI.PPCApplication
             }
             catch { }
 
+            try
+            {
+                var frame = InsightsFrame.CreateEmpty(DateTime.UtcNow);
+                InsightsManager.Default.InsertFrame(frame);
+            }
+            catch { }
+
             Process.Start(Application.ResourceAssembly.Location);
             Environment.Exit(0);
         }
@@ -547,6 +562,13 @@ namespace Tango.PPC.UI.PPCApplication
             }
             catch { }
 
+            try
+            {
+                var frame = InsightsFrame.CreateEmpty(DateTime.UtcNow);
+                InsightsManager.Default.InsertFrame(frame);
+            }
+            catch { }
+
             LogManager.Log($"Executing '{updaterPath}' with arguments '{arguments}'...");
             Process.Start(updaterPath, arguments);
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index c782fc2c6..569621432 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -485,6 +485,10 @@
       <Project>{4399af76-db52-4cfb-8020-6f85bdb29fd5}</Project>
       <Name>Tango.Explorer</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Insights\Tango.Insights.csproj">
+      <Project>{4A55C185-3F8D-41B0-8815-C15F6213A14A}</Project>
+      <Name>Tango.Insights</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Integration\Tango.Integration.csproj">
       <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
       <Name>Tango.Integration</Name>
@@ -713,7 +717,7 @@ if $(ConfigurationName) == Debug copy /Y "$(TargetDir)Packages" "$(TargetDir)"</
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Insights/InsightsListener.cs b/Software/Visual_Studio/Tango.Insights/InsightsListener.cs
index 40d6502f0..6a9e7726b 100644
--- a/Software/Visual_Studio/Tango.Insights/InsightsListener.cs
+++ b/Software/Visual_Studio/Tango.Insights/InsightsListener.cs
@@ -93,7 +93,7 @@ namespace Tango.Insights
                     _timer.Interval = SamplingInterval.TotalMilliseconds;
                 }
 
-                InsertInsightsGap();
+                //InsertInsightsGap();
 
                 _writing = false;
                 _timerCount = 0;