summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-11-10 15:15:25 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-11-10 15:15:25 -0800
commitdcf4ddacd81e3864525c44f145514911116daebd (patch)
treee1bce57b3b8760029565771eaad8f4516ba0c8ff /indra
parenta891cae876ad903e75c9e119584956e4ca4b29ef (diff)
fix race between resume and download check.
Diffstat (limited to 'indra')
-rw-r--r--indra/viewer_components/updater/llupdaterservice.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 4eb317e668..28d9075efa 100644
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -137,9 +137,9 @@ LLUpdaterServiceImpl::~LLUpdaterServiceImpl()
void LLUpdaterServiceImpl::initialize(const std::string& protocol_version,
const std::string& url,
- const std::string& path,
- const std::string& channel,
- const std::string& version)
+ const std::string& path,
+ const std::string& channel,
+ const std::string& version)
{
if(mIsChecking)
{
@@ -226,6 +226,7 @@ bool LLUpdaterServiceImpl::checkForResume()
llstat stat_info;
if(0 == LLFile::stat(mUpdateDownloader.downloadMarkerPath(), &stat_info))
{
+ mIsChecking = true;
mUpdateDownloader.resume();
result = true;
}