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

Guard against comparing invalid iterators, which produces an assertion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-05-23 13:58:51 +00:00
parent 45e13c7fb6
commit fbb67d0e52
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/univ/menu.cpp
View File

@@ -346,7 +346,7 @@ void wxPopupMenuWindow::SetCurrentItem(wxMenuItemIter node)
void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node) void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)
{ {
if ( node != m_nodeCurrent ) if ( !m_nodeCurrent || (node != m_nodeCurrent) )
{ {
wxMenuItemIter nodeOldCurrent = m_nodeCurrent; wxMenuItemIter nodeOldCurrent = m_nodeCurrent;
@@ -762,7 +762,7 @@ void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
// the window (see below) // the window (see below)
if ( node ) if ( node )
{ {
if ( node != m_nodeCurrent ) if ( !m_nodeCurrent || (node != m_nodeCurrent) )
{ {
ChangeCurrent(node); ChangeCurrent(node);