Diff of /trunk/TSAdminTool/ATSAmdin.Installer.cs

Parent Directory | Revision Log | Patch

--- trunk/TSAdminTool/ATSAmdin.Installer.cs	2012/07/16 11:26:49	173
+++ trunk/TSAdminTool/ATSAmdin.Installer.cs	2012/07/16 11:38:24	174
@@ -85,21 +85,19 @@
                     DBInstance = this.Context.Parameters["DBINSTANCE"];
                     try
                     {
-                        string server = ATSGlobals.GetATSRegValueString(ProSupport.strRegDatabaseServer);
-                        string instance = ATSGlobals.GetATSRegValueString(ProSupport.strRegDatabaseInstance);
-                        int first_run = 0;
-                        try
-                        {
-                            first_run = Convert.ToInt32(ATSGlobals.GetATSRegValueString("RunFirstTime"));
-                        }
-                        catch { first_run = 0; }
-                        if (first_run != 1)
-                        {
-                            if (!string.IsNullOrEmpty(server))
-                                DBServer = server;
-                            if (!string.IsNullOrEmpty(instance))
-                                DBInstance = instance;
-                        }
+                        string server = string.Empty;
+                        string instance = string.Empty;
+
+                        try { server = ATSGlobals.GetATSRegValueString(ProSupport.strRegDatabaseServer); }
+                        catch { } 
+                        try { instance = ATSGlobals.GetATSRegValueString(ProSupport.strRegDatabaseInstance); }
+                        catch { }
+                        Logging.ATSAdminInstallerLog.DebugFormat("RegServer={0} RegInstance={1}", server, instance);
+
+                        if (!string.IsNullOrEmpty(server))
+                            DBServer = server;
+                        if (!string.IsNullOrEmpty(instance))
+                            DBInstance = instance;
                     }
                     catch
                     {