Skip to content
Snippets Groups Projects
Commit 5a6ef4e8 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-14217 Shutdown crash

Don't process EventQueueGet responses from server when disconected
parent 99d2ae5e
No related branches found
No related tags found
No related merge requests found
......@@ -166,6 +166,14 @@ namespace Details
// LL_DEBUGS("LLEventPollImpl::eventPollCoro") << "<" << counter << "> result = "
// << LLSDXMLStreamer(result) << LL_ENDL;
if (gDisconnected)
{
// Lost connection or disconnected during quit, don't process sim/region update
// messages, they might populate some cleaned up classes (LLWorld, region and object list)
LL_INFOS("LLEventPollImpl") << "Dropping event messages" << LL_ENDL;
break;
}
LLSD httpResults = result["http_result"];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
......@@ -210,7 +218,7 @@ namespace Details
llcoro::suspendUntilTimeout(waitToRetry);
if (mDone)
if (mDone || gDisconnected)
break;
LL_INFOS("LLEventPollImpl") << "<" << counter << "> About to retry request." << LL_ENDL;
continue;
......
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