livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "FIRE-34497 - Bugsplat - crash during shutdown due to null mutex." 

This reverts commit a4d6fad698.
master
Ansariel 2024-09-17 17:15:54 +02:00
parent 92ebc8887f
commit 0351cec50e
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llplugin/llpluginprocessparent.cpp
View File

@ -157,18 +157,8 @@ LLPluginProcessParent::ptr_t LLPluginProcessParent::create(LLPluginProcessParent
/*static*/
void LLPluginProcessParent::shutdown()
{
// <FS:Beq> FIRE-34497 - lock maybe be null during shutdown due to fiber shutdown race condition
// LLCoros::LockType lock(*sInstancesMutex);
std::unique_ptr<LLCoros::LockType> lock;
if (sInstancesMutex)
{
lock = std::make_unique<LLCoros::LockType>(*sInstancesMutex);
}
else
{
LL_WARNS("Plugin") << "shutdown called but no instances mutex available" << LL_ENDL;
}
// </FS:Beq>
LLCoros::LockType lock(*sInstancesMutex);
mapInstances_t::iterator it;
for (it = sInstances.begin(); it != sInstances.end(); ++it)
{