aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.UI
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy.mail.net@gmail.com>2022-05-24 16:03:33 +0300
committerRoy Ben-Shabat <Roy.mail.net@gmail.com>2022-05-24 16:03:33 +0300
commitd63f3dcebd33aa7ea925dca33c63fc9994526c1b (patch)
tree05ba9875a598e8e9cb11785571109393a46546e4 /Software/Visual_Studio/PPC/Tango.PPC.UI
parentaf1b5b025b7f2e7d2d70ce02d7004c439325c9b3 (diff)
parent98b1a778572c2384ada8bd6b1ec799a8eb896d49 (diff)
downloadTango-d63f3dcebd33aa7ea925dca33c63fc9994526c1b.tar.gz
Tango-d63f3dcebd33aa7ea925dca33c63fc9994526c1b.zip
Merged PPC VFT
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index c23455fbd..9856faf3d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -64,7 +64,7 @@ namespace Tango.PPC.UI.Printing
#else
try
{
- if (_settings.EnableSpoolReplacementDialog && !_machineProvider.MachineOperator.IsSpoolReplaced)
+ if (job.Designation == JobDesignations.Default && _settings.EnableSpoolReplacementDialog && !_machineProvider.MachineOperator.IsSpoolReplaced)
{
if (!(await _notificationProvider.ShowDialog(new SpoolReplaceViewVM())).DialogResult)
{
@@ -146,6 +146,7 @@ namespace Tango.PPC.UI.Printing
if (!context.IsDisposed)
{
await context.SaveChangesAsync();
+ RaiseJobSaved(job);
}
else
{
@@ -156,11 +157,10 @@ namespace Tango.PPC.UI.Printing
{
newJob.JobStatus = JobStatuses.Completed;
await newContext.SaveChangesAsync();
+ RaiseJobSaved(job);
}
}
}
-
- RaiseJobSaved(job);
}
catch (Exception ex)
{