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

1 files changed, 4 insertions, 5 deletions

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 665847081..80fd4b0fd 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
@@ -546,6 +546,7 @@ namespace Tango.PPC.Jobs.ViewModels
             }
             catch (Exception ex)
             {
+                IsFree = true;
                 LogManager.Log(ex, $"Error loading job '{(_job_to_load != null ? _job_to_load.Name : "null")}'");
                 await NotificationProvider.ShowError("An error occurred while trying to load the selected job.");
                 _can_navigate_back = true;
@@ -553,11 +554,7 @@ namespace Tango.PPC.Jobs.ViewModels
             }
             finally
             {
-                InvokeUI(() =>
-                {
-                    IsFree = true;
-                    //NotificationProvider.ReleaseGlobalBusyMessage();
-                });
+                IsFree = true;
             }
         }
 
@@ -1427,6 +1424,8 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             bool result = true;
 
+            if (!IsFree) return false;
+
             if (!_can_navigate_back)
             {
                 bool jobChainged = false;