Move mirrors for get client version into branding file.

New branding options: updateMirrorX
where X is from 1 to 7.

2 files changed, 15 insertions, 7 deletions

diff --git a/src/defaults.cpp b/src/defaults.cpp
index 2db7acd41..386b58c5f 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -462,6 +462,13 @@ DefaultsData* getBrandingDefaults()
     AddDEF("windowsDownloadUrl", "http://download.evolonline.org/"
         "manaplus/download/manaplus-win32.exe");
     AddDEF("windowsDownloadText", "download here");
+    AddDEF("updateMirror1", "http://manaplus.org/update/");
+    AddDEF("updateMirror2", "http://www.manaplus.org/update/");
+    AddDEF("updateMirror3", "http://www2.manaplus.org/update/");
+    AddDEF("updateMirror4", "http://www3.manaplus.org/update/");
+    AddDEF("updateMirror5", "");
+    AddDEF("updateMirror6", "");
+    AddDEF("updateMirror7", "");
     return configData;
 }
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 4c1a94a13..e2c1b6128 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -560,15 +560,16 @@ void UpdaterWindow::download()
     if (mDownloadStatus == UPDATE_PATCH)
     {
         mDownload = new Net::Download(this,
-            "http://manaplus.org/update/" + mCurrentFile,
+            branding.getStringValue("updateMirror1") + mCurrentFile,
             &updateProgress,
             true, false, mValidateXml);
-        mDownload->addMirror("http://www.manaplus.org/update/"
-            + mCurrentFile);
-        mDownload->addMirror("http://www2.manaplus.org/update/"
-            + mCurrentFile);
-        mDownload->addMirror("http://www3.manaplus.org/update/"
-            + mCurrentFile);
+        for (int f = 2; f < 8; f ++)
+        {
+            const std::string url = branding.getStringValue(
+                "updateMirror" + toString(f));
+            if (!url.empty())
+                mDownload->addMirror(url + mCurrentFile);
+        }
     }
     else
     {