diff options
| -rw-r--r-- | src/gui/serverdialog.cpp | 5 | ||||
| -rw-r--r-- | src/net/download.cpp | 21 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index ed9696892..bae1154e3 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -471,10 +471,7 @@ void ServerDialog::downloadServerList() // Fall back to manaplus.evolonline.org when neither branding nor config set it if (listFile.empty()) - { - listFile = "http://manaplus.evolonline.org/" - "serverlist.xml/serverlist.xml"; - } + listFile = "http://manaplus.evolonline.org/serverlist.xml"; if (mDownload) { diff --git a/src/net/download.cpp b/src/net/download.cpp index d20713dfa..bc8ea4f72 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -306,16 +306,19 @@ int Download::downloadThread(void *ptr) // Any existing file with this name is deleted first, otherwise // the rename will fail on Windows. - ::remove(d->mFileName.c_str()); - ::rename(outFilename.c_str(), d->mFileName.c_str()); - - // Check if we can open it and no errors were encountered - // during renaming - file = fopen(d->mFileName.c_str(), "rb"); - if (file) + if (!d->mOptions.cancel) { - fclose(file); - complete = true; + ::remove(d->mFileName.c_str()); + ::rename(outFilename.c_str(), d->mFileName.c_str()); + + // Check if we can open it and no errors were encountered + // during renaming + file = fopen(d->mFileName.c_str(), "rb"); + if (file) + { + fclose(file); + complete = true; + } } } else |