From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 23 May 2006 13:58:51 +0000 (+0000)
Subject: Guard against comparing invalid iterators, which produces an assertion
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fbb67d0e5247da88d7c403dc61b95244dcc6c7dc?hp=45e13c7fb62cfe4b69269a1da3f8e9cf1d6de2dd

Guard against comparing invalid iterators, which produces an assertion


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index b1d27062f1..e25a936355 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -346,7 +346,7 @@ void wxPopupMenuWindow::SetCurrentItem(wxMenuItemIter node)
 
 void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)
 {
-    if ( node != m_nodeCurrent )
+    if ( !m_nodeCurrent || (node != m_nodeCurrent) )
     {
         wxMenuItemIter nodeOldCurrent = m_nodeCurrent;
 
@@ -762,7 +762,7 @@ void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
     // the window (see below)
     if ( node )
     {
-        if ( node != m_nodeCurrent )
+        if ( !m_nodeCurrent || (node != m_nodeCurrent) )
         {
             ChangeCurrent(node);