From 2d52aebc6df88ce9b946a7afa49a1785fb1c8acb Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Wed, 20 Jul 2011 13:50:15 +0000
Subject: 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
---
 CHANGES         | 1 +
 src/Fl_Menu.cxx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index c553d1326..eff99c2c8 100644
--- 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
index b1eb8d750..e2fe0936d 100644
--- 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;
 }
-- 
cgit v1.2.3