livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CHOP-369: catch case of synchronous download failure.

meow-7.2.2
Andrew A. de Laix 2011-01-24 10:54:08 -08:00
parent f9b9c7a581
commit 14042f631d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/viewer_components/updater/llupdaterservice.cpp
View File

@ -375,7 +375,11 @@ void LLUpdaterServiceImpl::optionalUpdate(std::string const & newVersion,
mIsDownloading = true;
mUpdateDownloader.download(uri, hash, newVersion, false);
setState(LLUpdaterService::DOWNLOADING);
if(getState() != LLUpdaterService::FAILURE) {
setState(LLUpdaterService::DOWNLOADING);
} else {
; // Download failed snynchronously; we are done.
}
}
void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion,
@ -387,7 +391,11 @@ void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion,
mIsDownloading = true;
mUpdateDownloader.download(uri, hash, newVersion, true);
setState(LLUpdaterService::DOWNLOADING);
if(getState() != LLUpdaterService::FAILURE) {
setState(LLUpdaterService::DOWNLOADING);
} else {
; // Download failed snynchronously; we are done.
}
}
void LLUpdaterServiceImpl::upToDate(void)