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 b1d27062f11e527a3fd1d14781bce54e815a1086..e25a936355256ba230bb8fa73d1e7157ad918ba0 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -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)
     if ( node )
     {
     // the window (see below)
     if ( node )
     {

-        if ( node != m_nodeCurrent )
+        if ( !m_nodeCurrent || (node != m_nodeCurrent) )

         {
             ChangeCurrent(node);
 
         {
             ChangeCurrent(node);