From 91082afaed2e859e42bad9b06739075689e71b3e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 21 Oct 2018 12:01:25 +0300 Subject: Machine Studio v3.5.52 --- .../MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs | 9 ++++++++- .../Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs index 9989aa091..feb1e41b3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs @@ -41,7 +41,14 @@ namespace Tango.MachineStudio.UI { InitializeComponent(); - _is_testing = TestHelper.IsRunningUnderTestStudio(); + try + { + _is_testing = TestHelper.IsRunningUnderTestStudio(); + } + catch (Exception ex) + { + LogManager.Log(ex, LogCategory.Warning, "An error occurred while trying to get the parent process of machine studio."); + } if (!_is_testing) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 075832b06..d4690c6b5 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("3.5.51.18238")] +[assembly: AssemblyVersion("3.5.52.18238")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1