Skip to content
Snippets Groups Projects
Commit e6f53ded authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

MAINT-7343 - Added check for shutdown in progress when asset result arrives

parent 6d737c92
No related branches found
No related tags found
No related merge requests found
...@@ -458,6 +458,12 @@ void LLViewerAssetStorage::assetRequestCoro( ...@@ -458,6 +458,12 @@ void LLViewerAssetStorage::assetRequestCoro(
LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts); LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts);
if (LLApp::isQuitting())
{
// Bail out if result arrives after shutdown has been started.
return;
}
LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS]; LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults); LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
if (!status) if (!status)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment