Fixed an infinite loop in the destructor of ACTION_MANAGER;
This commit is contained in:
parent
fc2d8e91c9
commit
aebb8b3ff9
|
@ -67,13 +67,13 @@ void ACTION_MANAGER::RegisterAction( TOOL_ACTION* aAction )
|
||||||
|
|
||||||
void ACTION_MANAGER::UnregisterAction( TOOL_ACTION* aAction )
|
void ACTION_MANAGER::UnregisterAction( TOOL_ACTION* aAction )
|
||||||
{
|
{
|
||||||
|
m_actionNameIndex.erase( aAction->m_name );
|
||||||
|
m_actionIdIndex.erase( aAction->m_id );
|
||||||
|
|
||||||
// Indicate that the ACTION_MANAGER no longer care about the object
|
// Indicate that the ACTION_MANAGER no longer care about the object
|
||||||
aAction->setActionMgr( NULL );
|
aAction->setActionMgr( NULL );
|
||||||
aAction->setId( -1 );
|
aAction->setId( -1 );
|
||||||
|
|
||||||
m_actionNameIndex.erase( aAction->m_name );
|
|
||||||
m_actionIdIndex.erase( aAction->m_id );
|
|
||||||
|
|
||||||
if( aAction->HasHotKey() )
|
if( aAction->HasHotKey() )
|
||||||
m_actionHotKeys.erase( aAction->m_currentHotKey );
|
m_actionHotKeys.erase( aAction->m_currentHotKey );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue