From 733f0ce4feef6b7dc4151ffe0f896efb53640314 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 15 Aug 2019 10:44:19 +0300
Subject: Machine Studio 4.0.23.0 PPC 1.0.40.0

---
 .../PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs              | 6 ++++++
 .../PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs             | 5 +++++
 Software/Visual_Studio/PPC/Tango.PPC.UI/App.config                  | 1 +
 Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs  | 2 +-
 Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest                | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/PPC')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 2ae9df7fb..c78af155c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -1194,6 +1194,7 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <summary>
         /// Iterates over all brush stops and checks for out of gamut.
         /// </summary>
+        [HandleProcessCorruptedStateExceptions]
         private void CheckGamutThreadMethod()
         {
             while (true)
@@ -1211,6 +1212,11 @@ namespace Tango.PPC.Jobs.ViewModels
                             stop.IsOutOfGamut = _converter.IsOutOfGamut(stop);
                             stop.OutOfGamutChecked = true;
                         }
+                        catch (AccessViolationException)
+                        {
+                            LogManager.Log($"Out of gamut check failed for brush stop {stop.StopIndex} at segment {stop.Segment.SegmentIndex}.", LogCategory.Warning);
+                            continue;
+                        }
                         catch
                         {
                             LogManager.Log($"Out of gamut check failed for brush stop {stop.StopIndex} at segment {stop.Segment.SegmentIndex}.", LogCategory.Warning);
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index 3ea7ae6f4..a7b06f6eb 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -466,6 +466,11 @@ namespace Tango.PPC.Jobs.ViewModels
                             else if (_catalogs.Count > 1)
                             {
                                 catalogVM = await NotificationProvider.ShowDialog<CatalogSelectionViewVM>(catalogVM);
+
+                                if (!catalogVM.DialogResult)
+                                {
+                                    return;
+                                }
                             }
                         }
                     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
index 9a0087c43..9d2de4c50 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
@@ -8,6 +8,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
   </startup>
   <runtime>
+    <legacyCorruptedStateExceptionsPolicy enabled="true|false"/>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 
      
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 262cf8853..8d7de3537 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.36.0")]
+[assembly: AssemblyVersion("1.0.40.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
-- 
cgit v1.3.1