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

Disconnect from region change callback if AOEngine gets destroyed

Ansariel 2014-07-25 07:53:23 +02:00
parent 4200044961
commit 470a273529
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/aoengine.cpp
View File

@ -66,12 +66,17 @@ AOEngine::AOEngine() :
{
gSavedPerAccountSettings.getControl("UseAO")->getCommitSignal()->connect(boost::bind(&AOEngine::onToggleAOControl, this));
gAgent.addRegionChangedCallback(boost::bind(&AOEngine::onRegionChange, this));
mRegionChangeConnection = gAgent.addRegionChangedCallback(boost::bind(&AOEngine::onRegionChange, this));
}
AOEngine::~AOEngine()
{
clear(false);
if (mRegionChangeConnection.connected())
{
mRegionChangeConnection.disconnect();
}
}
void AOEngine::init()

2
indra/newview/aoengine.h
View File

@ -214,6 +214,8 @@ class AOEngine
std::vector<AOSet*> mOldImportSets;
LLUUID mImportCategory;
S32 mImportRetryCount;
boost::signals2::connection mRegionChangeConnection;
};
#endif // AOENGINE_H