From 863ae2f6ef02c1732245e6d90e1b5867e9d16bab Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Fri, 30 Jan 2015 16:21:52 +0300
Subject: [PATCH] scheduler installer fix

---
 .../Sources/Setup.SchedulerService/Product.wxs                  | 2 +-
 .../WebsitePanel.SchedulerServiceInstaller/CustomAction.cs      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs b/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs
index 60a0c1bc..42e79b27 100644
--- a/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs
+++ b/WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs
@@ -103,7 +103,7 @@
             <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallLocationDlg" Order="3">
               LicenseAccepted = "1"
             </Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="DatabaseConnectionDlg">SKIPCONNECTIONSTRINGSTEP = "1"</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="DatabaseConnectionDlg">SKIPCONNECTIONSTRINGSTEP = "0"</Publish>
           <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallLocationDlg">SKIPCONNECTIONSTRINGSTEP = "1"</Publish>
             <TextStyle Id="DlgTitleFont" FaceName="Tahoma" Size="8" Bold="yes" />
         </UI>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.SchedulerServiceInstaller/CustomAction.cs b/WebsitePanel.Installer/Sources/WebsitePanel.SchedulerServiceInstaller/CustomAction.cs
index 01549e05..99e36879 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.SchedulerServiceInstaller/CustomAction.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.SchedulerServiceInstaller/CustomAction.cs
@@ -53,6 +53,8 @@ namespace WebsitePanel.SchedulerServiceInstaller
         {
             string testConnectionString = session["AUTHENTICATIONTYPE"].Equals("Windows Authentication") ? GetConnectionString(session["SERVERNAME"], "master") : GetConnectionString(session["SERVERNAME"], "master", session["LOGIN"], session["PASSWORD"]);
 
+            testConnectionString = testConnectionString.Replace(CustomDataDelimiter, ";");
+
             if (CheckConnection(testConnectionString))
             {
                 session["CORRECTCONNECTION"] = "1";