Commit aebb8b3f authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Fixed an infinite loop in the destructor of ACTION_MANAGER;

parent fc2d8e91

common/tool/action_manager.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 );

}

}