Working on external bridge v2

2 files changed, 7 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 6d90ece73..9b818bd9d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -81,7 +81,7 @@ namespace Tango.PPC.Common.Connection
             MachineOperator.EnableJobResume = true;
             MachineOperator.UseKeepAlive = true;
             MachineOperator.EnableMachineStatusUpdates = true;
-            MachineOperator.EnableDiagnostics = false;
+            MachineOperator.EnableDiagnostics = true;
             MachineOperator.EnableEmbeddedDebugging = settings.EnableEmbeddedDebugLogs;
             MachineOperator.EnableAutomaticThreadLoading = settings.EnableAutomaticThreadLoading;
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
index ebe68a5d3..fd0e288c8 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
@@ -111,6 +111,12 @@ namespace Tango.PPC.UI
                 return;
             }
 
+            if (e.Exception.ToString().Contains("A Task's exception(s) were not observed"))
+            {
+                LogManager.Log("Task not observed exception. Ignoring...");
+                return;
+            }
+
             try
             {
                 LogManager.Log(e.Exception, "Application Crashed!");