From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 15 Jun 2015 11:43:29 +0000 (+0200)
Subject: Move NSClient++ installation step after all other wizard steps
X-Git-Tag: v2.4.0~613
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0f7aa4fe65c8f6163910adfbb7149006b14b772;p=icinga2

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 15952c76a..6186f3311 100644
--- 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();