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

Align tool: Only really try to delete the thread after it has really stopped and get rid of the overridden shutdown() method since calling a virtual method from a dtor is never a good idea

master
Ansariel 2015-11-02 15:36:58 +01:00
parent d942732010
commit 3ea7ebc09a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/qtoolalign.cpp
View File

@ -474,7 +474,11 @@ public:
}
BOOL tick()
{
AlignThread::sInstance->shutdown();
if (!AlignThread::sInstance->isStopped())
{
return FALSE;
}
delete AlignThread::sInstance;
AlignThread::sInstance = NULL;
LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
@ -652,7 +656,3 @@ void AlignThread::run()
QToolAlign::getInstance()->aligndone();
}
void AlignThread::shutdown()
{
}

3
indra/newview/qtoolalign.h
View File

@ -19,9 +19,8 @@ class AlignThread : public LLThread
{
public:
AlignThread(void);
~AlignThread();
~AlignThread();
/*virtual*/ void run(void);
/*virtual*/ void shutdown(void);
static AlignThread* sInstance;
};