Move NSClient++ installation step after all other wizard steps

refs #9263

diff --git a/agent/windows-setup-agent/SetupWizard.cs b/agent/windows-setup-agent/SetupWizard.cs
index 15952c76a83734fbef036be5b1a88a8ca363e578..6186f3311fe2a64c56dee515c883400e259bf075 100644 (file)
--- a/agent/windows-setup-agent/SetupWizard.cs
+++ b/agent/windows-setup-agent/SetupWizard.cs
@@ -176,17 +176,6 @@ namespace Icinga
 
                private void ConfigureService()
                {
-                       if (chkInstallNSCP.Checked)
-                       {
-                               SetConfigureStatus(0, "Waiting for NSClient++ installation to complete...");
-
-                               Process proc = new Process();
-                               proc.StartInfo.FileName = "msiexec.exe";
-                               proc.StartInfo.Arguments = "/i \"" + Program.Icinga2InstallDir + "\\sbin\\NSCP-Win32.msi\"";
-                               proc.Start();
-                               proc.WaitForExit();
-                       }
-
                        SetConfigureStatus(0, "Updating configuration files...");
 
                        string output;
@@ -260,6 +249,17 @@ namespace Icinga
                                return;
                        }
 
+                       if (chkInstallNSCP.Checked)
+                       {
+                               SetConfigureStatus(85, "Waiting for NSClient++ installation to complete...");
+
+                               Process proc = new Process();
+                               proc.StartInfo.FileName = "msiexec.exe";
+                               proc.StartInfo.Arguments = "/i \"" + Program.Icinga2InstallDir + "\\sbin\\NSCP-Win32.msi\"";
+                               proc.Start();
+                               proc.WaitForExit();
+                       }
+
                        SetConfigureStatus(100, "Finished.");
 
                        FinishConfigure();