Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport fix for crash in wxCommandProcessor::Store. Closes #12027

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@65725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Tim Kosse
2010-10-02 13:05:08 +00:00
parent 31750f130d
commit 01c11c0d32
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/cmdproc.cpp
View File

@@ -108,18 +108,6 @@ void wxCommandProcessor::Store(wxCommand *command)
{ {
wxCHECK_RET( command, _T("no command in wxCommandProcessor::Store") ); wxCHECK_RET( command, _T("no command in wxCommandProcessor::Store") );
if ( (int)m_commands.GetCount() == m_maxNoCommands )
{
wxList::compatibility_iterator firstNode = m_commands.GetFirst();
wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
delete firstCommand;
m_commands.Erase(firstNode);
// Make sure m_lastSavedCommand won't point to freed memory
if ( m_lastSavedCommand == firstNode )
m_lastSavedCommand = wxList::compatibility_iterator();
}
// Correct a bug: we must chop off the current 'branch' // Correct a bug: we must chop off the current 'branch'
// so that we're at the end of the command list. // so that we're at the end of the command list.
if (!m_currentCommand) if (!m_currentCommand)
@@ -141,6 +129,18 @@ void wxCommandProcessor::Store(wxCommand *command)
} }
} }
if ( (int)m_commands.GetCount() == m_maxNoCommands )
{
wxList::compatibility_iterator firstNode = m_commands.GetFirst();
wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
delete firstCommand;
m_commands.Erase(firstNode);
// Make sure m_lastSavedCommand won't point to freed memory
if ( m_lastSavedCommand == firstNode )
m_lastSavedCommand = wxList::compatibility_iterator();
}
m_commands.Append(command); m_commands.Append(command);
m_currentCommand = m_commands.GetLast(); m_currentCommand = m_commands.GetLast();
SetMenuStrings(); SetMenuStrings();