diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-07-20 13:50:15 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-07-20 13:50:15 +0000 |
| commit | 2d52aebc6df88ce9b946a7afa49a1785fb1c8acb (patch) | |
| tree | 6c5396e7845c3a485bc01b25b094f8db2e44a936 | |
| parent | 5b98e80a4f223c8d04fc96e2e3bcf59e760558f8 (diff) | |
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
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/Fl_Menu.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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; } |