summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <bertram@cegetel.net>2005-09-18 01:51:13 +0000
committerYohann Ferreira <bertram@cegetel.net>2005-09-18 01:51:13 +0000
commitf37c53e452b8f6b6b6e52841bdb2f50f5fb83fb1 (patch)
tree3d03da34c36affac59bc0ac187c79b7236a2a56a
parent982233834722bbd719c5afb5e9ea79a7d7981a15 (diff)
downloadmana-f37c53e452b8f6b6b6e52841bdb2f50f5fb83fb1.tar.gz
mana-f37c53e452b8f6b6b6e52841bdb2f50f5fb83fb1.tar.bz2
mana-f37c53e452b8f6b6b6e52841bdb2f50f5fb83fb1.tar.xz
mana-f37c53e452b8f6b6b6e52841bdb2f50f5fb83fb1.zip
Temporary fixed a bug in the determination of the update host I had.
-rw-r--r--ChangeLog2
-rw-r--r--src/gui/updatewindow.cpp7
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 44905d56..322c3164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
for existence of a file with same name before writing; In that
case the screenshot's number is incremented until it finds
an adequate name.
+ * src/gui/updatewindow.cpp: Corrected a bug in the determination
+ of the update host I had.
2005-09-18 Björn Steinbrink <B.Steinbrink@gmx.de>
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 0c7bd7a7..f0aa4b5d 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -85,7 +85,11 @@ UpdaterWindow::UpdaterWindow():
mCancelButton->requestFocus();
setLocationRelativeTo(getParent());
- mUpdateHost = config.getValue("updatehost", "themanaworld.org/files");
+ // That commented line causes problems if the client had a false value for an update host
+ // in its config file.
+ // The update host, unlike the home dir, isn't dynamically set at the start of the client.
+ //mUpdateHost = config.getValue("updatehost", "themanaworld.org/files");
+ mUpdateHost = "themanaworld.org/files";
mBasePath = config.getValue("homeDir", ".");
// Try to download the updates list
@@ -238,6 +242,7 @@ int UpdaterWindow::downloadThread(void *ptr)
UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(ptr);
std::string outFilename;
std::string url(uw->mUpdateHost + "/" + uw->mCurrentFile);
+ std::cout << url << std::endl;
uw->setLabel(uw->mCurrentFile + " (0%)");
curl = curl_easy_init();