SL-13811 Crash on coroprocedure

Coroprosedure should stop on 'stop' exception
2020-08-19 21:27:58 +03:00 · 2020-08-19 21:27:58 +03:00 · ed9a0bd2e6
parent 8b33f3df14
commit ed9a0bd2e6
1 changed files with 8 additions and 0 deletions
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@ -421,6 +421,14 @@ void LLCoprocedurePool::coprocedureInvokerCoro(
        {
            coproc->mProc(httpAdapter, coproc->mId);
        }
+        catch (const LLCoros::Stop &)
+        {
+            LL_INFOS("CoProcMgr") << "Viewer is shutting Down. Stopping coprocedure('" << coproc->mName
+                                   << "', id=" << coproc->mId.asString()
+                                   << ") in pool '" << mPoolName << "'" << LL_ENDL;
+            mActiveCoprocs.erase(itActive);
+            throw; // let toplevel handle this as LLContinueError
+        }
        catch (...)
        {
            LOG_UNHANDLED_EXCEPTION(STRINGIZE("Coprocedure('" << coproc->mName