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

Fix for lllogin_tests crash on shutdown. 

RegisterFlush destructor was dereferencing a dangling reference to the mainloop EventPump which had already been destructed.
meow-7.2.2
brad kittenbrink 2009-08-06 15:01:26 -07:00
parent a8d216e194
commit 843036a7d2
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llcommon/llevents.cpp
View File

@ -59,14 +59,12 @@ const char* queue_names[] =
/*****************************************************************************
* If there's a "mainloop" pump, listen on that to flush all LLEventQueues
*****************************************************************************/
struct RegisterFlush
struct RegisterFlush : public LLEventTrackable
{
RegisterFlush():
pumps(LLEventPumps::instance()),
mainloop(pumps.obtain("mainloop")),
name("flushLLEventQueues")
pumps(LLEventPumps::instance())
{
mainloop.listen(name, boost::bind(&RegisterFlush::flush, this, _1));
pumps.obtain("mainloop").listen("flushLLEventQueues", boost::bind(&RegisterFlush::flush, this, _1));
}
bool flush(const LLSD&)
{
@ -75,11 +73,9 @@ struct RegisterFlush
}
~RegisterFlush()
{
mainloop.stopListening(name);
// LLEventTrackable handles stopListening for us.
}
LLEventPumps& pumps;
LLEventPump& mainloop;
const std::string name;
};
static RegisterFlush registerFlush;