Fixed Fl_Menu issue with unusual menu flags (STR #2680).

Setting some flags in a terminating Fl_Menu_Item (one with a NULL label/text/name) caused an endless loop. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8866 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Jul 20, 2011 · 2d52aeb · 2d52aeb
1 parent 5b98e80
commit 2d52aeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,7 @@
 
 CHANGES IN FLTK 1.3.1
 
+	- Fixed Fl_Menu issue with unusual menu flags (STR #2680)
 	- Fixed Windows DLL import of fl_xid() (STR #2670)
 
 CHANGES IN FLTK 1.3.0

diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
@@ -72,7 +72,7 @@ const Fl_Menu_Item* Fl_Menu_Item::next(int n) const {
   if (!m->visible()) n++;
   while (n) {
     m = next_visible_or_not(m);
-    if (m->visible()) n--;
+    if (m->visible() || !m->text) n--;
   }
   return m;
 }