Ticket #10341: defaultDBsettingFix.diff

mythtv/libs/libmythbase/mythdb.cpp

@@ -876 +876 @@
         return false;
     }
 
-    params.dbHostName = settings.GetSetting("DBHostName");
-    params.dbHostPing = settings.GetSetting("DBHostPing") != "no";
-    params.dbPort     = settings.GetNumSetting("DBPort", 3306);
-    params.dbUserName = settings.GetSetting("DBUserName");
-    params.dbPassword = settings.GetSetting("DBPassword");
-    params.dbName     = settings.GetSetting("DBName");
-    params.dbType     = settings.GetSetting("DBType");
-
-    params.localHostName = settings.GetSetting("LocalHostName");
+    LoadDefaultDatabaseParams(params);
+
+    params.dbHostName = settings.GetSetting("DBHostName",params.dbHostName);
+    params.dbHostPing = settings.GetSetting("DBHostPing", 
+                            (params.dbHostPing?"yes":"no")) != "no";
+    params.dbPort     = settings.GetNumSetting("DBPort", params.dbPort);
+    params.dbUserName = settings.GetSetting("DBUserName",params.dbUserName);
+    params.dbPassword = settings.GetSetting("DBPassword",params.dbPassword);
+    params.dbName     = settings.GetSetting("DBName",params.dbName);
+    params.dbType     = settings.GetSetting("DBType",params.dbType);
+
+    params.localHostName = settings.GetSetting("LocalHostName",
+                                                    params.localHostName);
     params.localEnabled  = !params.localHostName.isEmpty();
 
     params.wolReconnect  =
-        settings.GetNumSetting("WOLsqlReconnectWaitTime");
+        settings.GetNumSetting("WOLsqlReconnectWaitTime", params.wolReconnect);
     params.wolEnabled = params.wolReconnect > 0;
 
-    params.wolRetry   = settings.GetNumSetting("WOLsqlConnectRetry");
-    params.wolCommand = settings.GetSetting("WOLsqlCommand");
+    params.wolRetry   = settings.GetNumSetting("WOLsqlConnectRetry",
+                                                    params.wolRetry);
+    params.wolCommand = settings.GetSetting("WOLsqlCommand",params.wolCommand);
 
     return ValidateDatabaseParams(params, "mysql.txt");
 }