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

2017-04-24 11:25:04 -04:00 · 2017-04-24 11:25:04 -04:00 · e6f53dedb7
parent 6d737c927c
commit e6f53dedb7
1 changed files with 6 additions and 0 deletions
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@ -458,6 +458,12 @@ void LLViewerAssetStorage::assetRequestCoro(

    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];
    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
    if (!status)