Commits

alain_linden committed b2304fc

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

Comments (0)

Files changed (1)

indra/viewer_components/updater/llupdaterservice.cpp

 	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,
 	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)