From dcf4ddacd81e3864525c44f145514911116daebd Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Wed, 10 Nov 2010 15:15:25 -0800
Subject: [PATCH] fix race between resume and download check.
---
indra/viewer_components/updater/llupdaterservice.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 4eb317e668e..28d9075efa6 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;
}
--
GitLab