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

1 files changed, 9 insertions, 9 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
index 57c2200c6..ef033626a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
@@ -171,15 +171,6 @@ namespace Tango.PPC.UI.ViewModels
             SkipEmbeddedTestCommand = new RelayCommand(SkipEmbeddedTest);
             InstallCommand = new RelayCommand(Install);
             RestartCommand = new RelayCommand(() => { NavigateTo(MachineSetupView.WelcomeView); });
-
-            if (!LogManager.Categories.Contains(LogCategory.Debug))
-            {
-                LogManager.Categories.Add(LogCategory.Debug);
-            }
-
-            var logger = new SimpleStringLogger();
-            LogManager.RegisterLogger(logger);
-            logger.LogReceived += Logger_LogReceived;
         }
 
         #endregion
@@ -193,6 +184,15 @@ namespace Tango.PPC.UI.ViewModels
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         private void ApplicationManager_SetupRequired(object sender, EventArgs e)
         {
+            if (!LogManager.Categories.Contains(LogCategory.Debug))
+            {
+                LogManager.Categories.Add(LogCategory.Debug);
+            }
+
+            var logger = new SimpleStringLogger();
+            LogManager.RegisterLogger(logger);
+            logger.LogReceived += Logger_LogReceived;
+
             LogManager.Log("SetupRequired event received. Navigating to MachineSetupView...");
             NavigationManager.NavigateTo(NavigationView.MachineSetupView);
         }