From 57a2806b7d5fe6f5656136258714201d60d9bfe4 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 4 Aug 2020 16:23:28 +0300 Subject: Fixed issue with PPC exit job view before job loading completes causing an error message. Fixed job view "job length" field not scrolling when focused because of virtualization. --- .../PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs') 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; -- cgit v1.3.1