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

1 files changed, 7 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 6303b1ac8..baa550017 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -26,7 +26,6 @@ using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.UI.Views;
 using Tango.Integration.Operation;
 using Tango.MachineStudio.UI.Windows;
-using Tango.MachineStudio.Common.JobRunsLogging;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
@@ -40,7 +39,6 @@ namespace Tango.MachineStudio.UI.StudioApplication
         private INavigationManager _navigationManager;
         private IStudioModuleLoader _moduleLoader;
         private INotificationProvider _notification;
-        private IJobRunsLogger _jobRunsLogger;
         private List<Window> _openedWindows;
         private List<IStudioViewModel> _notified_view_models;
 
@@ -53,9 +51,8 @@ namespace Tango.MachineStudio.UI.StudioApplication
         /// Initializes a new instance of the <see cref="DefaultStudioApplicationManager" /> class.
         /// </summary>
         /// <param name="navigationManager">The navigation manager.</param>
-        public DefaultStudioApplicationManager(INavigationManager navigationManager, IStudioModuleLoader moduleLoader, INotificationProvider notification, IJobRunsLogger jobRunsLogger)
+        public DefaultStudioApplicationManager(INavigationManager navigationManager, IStudioModuleLoader moduleLoader, INotificationProvider notification)
         {
-            _jobRunsLogger = jobRunsLogger;
             _moduleLoader = moduleLoader;
             _navigationManager = navigationManager;
             _notification = notification;
@@ -350,7 +347,6 @@ namespace Tango.MachineStudio.UI.StudioApplication
             });
 
             ApplicationReady?.Invoke(this, new EventArgs());
-            _jobRunsLogger.Init(this);
         }
 
         /// <summary>
@@ -362,6 +358,12 @@ namespace Tango.MachineStudio.UI.StudioApplication
             if (connectedMachine != null)
             {
                 Machine = ObservablesStaticCollections.Instance.Machines.SingleOrDefault(x => x.SerialNumber == connectedMachine.SerialNumber);
+
+                if (Machine == null)
+                {
+                    throw new NullReferenceException($"The specified machine '{connectedMachine.SerialNumber}' could not be found on the database.");
+                }
+
                 ConnectedMachine = connectedMachine;
                 ConnectedMachine.SetMachine(Machine);
             }