Final touches on X1.

2 files changed, 17 insertions, 5 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModelLocator.cs
index 2004d60b7..d3aa7d485 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModelLocator.cs
@@ -22,10 +22,7 @@ namespace Tango.PPC.Jobs
             TangoIOC.Default.Register<JobSummeryViewVM>();
             TangoIOC.Default.Register<JobViewVM>();
             TangoIOC.Default.Register<TwineCatalogViewVM>();
-            if (TangoIOC.Default.GetInstance<IBuildProvider>().BuildType == BuildType.TS1800)
-            {
-                TangoIOC.Default.Register<JobProgressViewVM>();
-            }
+            TangoIOC.Default.Register<JobProgressViewVM>();
             TangoIOC.Default.Register<ColorSelectionViewVM>();
         }
 
@@ -91,7 +88,14 @@ namespace Tango.PPC.Jobs
         {
             get
             {
-                return TangoIOC.Default.GetInstance<JobProgressViewVM>();
+                if (TangoIOC.Default.GetInstance<IBuildProvider>().BuildType == BuildType.TS1800)
+                {
+                    return TangoIOC.Default.GetInstance<JobProgressViewVM>();
+                }
+                else
+                {
+                    return null;
+                }
             }
         }
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/MainViewVM.cs
index 1ceb47ebd..5e0d36da5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/MainViewVM.cs
@@ -151,6 +151,14 @@ namespace Tango.PPC.Jobs.ViewModels
             }
             else
             {
+                if (BuildProvider.MachineType.IsXMachine())
+                {
+                    foreach (var item in NotificationProvider.NotificationItems.Where(x => x.CanClose).ToList())
+                    {
+                        NotificationProvider.PopNotification(item);
+                    }
+                }
+
                 NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("'{0}' completed successfully", e.Job.Name), "Tap to view this job details.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
                 {
                     NavigationManager.NavigateWithObject<JobsV2Module, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job });