diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaults.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/serverdialog.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 39eae6711..8a4d70999 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -435,7 +435,9 @@ DefaultsData* getBrandingDefaults() AddDEF("defaultPort", DEFAULT_PORT); AddDEF("defaultServerType", "tmwathena"); AddDEF("onlineServerList", - "http://manaplus.org/serverlist.xml"); + "http://manaplus.org/serverlist1.xml"); + AddDEF("onlineServerList2", + "http://www.manaplus.org/serverlist.xml"); AddDEF("onlineServerFile", "serverlistplus.xml"); AddDEF("appShort", "mana"); AddDEF("screenshots", "ManaPlus"); diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 2f50a4744..6c72301ca 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -424,6 +424,7 @@ void ServerDialog::downloadServerList() { // Try to load the configuration value for the onlineServerList std::string listFile = branding.getStringValue("onlineServerList"); + std::string listFile2 = branding.getStringValue("onlineServerList2"); // Fall back to manaplus.org when neither branding // nor config set it @@ -440,6 +441,8 @@ void ServerDialog::downloadServerList() &downloadUpdate, false, false, true); mDownload->setFile(std::string(mDir).append("/").append( branding.getStringValue("onlineServerFile"))); + if (!listFile2.empty()) + mDownload->addMirror(listFile2); mDownload->start(); config.setValue("serverslistupdate", getDateString()); |