diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-25 19:21:22 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-25 19:21:22 +0000 |
commit | 33e19fb0822308a630ca6e1122b9b97882a120a7 (patch) | |
tree | 78f80d6673bd5e52431d2fad986c0f1416dfd780 /src/gui/updatewindow.cpp | |
parent | c7e7b62aa94bf295ca1dc556762ad6070221e0cd (diff) | |
download | mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.tar.gz mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.tar.bz2 mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.tar.xz mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.zip |
Fixed Linux compiling issues and merged update system fix for Windows.
Diffstat (limited to 'src/gui/updatewindow.cpp')
-rw-r--r-- | src/gui/updatewindow.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 8f43903f..3f5fe7bb 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -106,8 +106,7 @@ UpdaterWindow::~UpdaterWindow() free(mMemoryBuffer); } - // Remove downloaded files - remove((mBasePath + "/updates/news.txt").c_str()); + // Remove possibly leftover temporary download remove((mBasePath + "/updates/download.temp").c_str()); delete[] mCurlError; @@ -293,10 +292,14 @@ int UpdaterWindow::downloadThread(void *ptr) if (!uw->mStoreInMemory) { fclose(outfile); - // If the download was successful give the file the proper name - // else it will be deleted later + + // Give the file the proper name std::string newName(uw->mBasePath + "/updates/" + uw->mCurrentFile.c_str()); + + // Any existing file with this name is deleted first, otherwise the + // rename will fail on Windows. + remove(newName.c_str()); rename(outFilename.c_str(), newName.c_str()); } } |