FLTK logo

[master] 5d9db35 - Fix for #381, `backward` function crash

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 5d9db35 - Fix for #381, `backward` function crash "Matthias Melcher" Jan 26, 2022  
 
commit 5d9db353868008ae2f2b47ed501ee92d110b5313
Author:     Matthias Melcher <github@matthiasm.com>
AuthorDate: Wed Jan 26 17:17:24 2022 +0100
Commit:     Matthias Melcher <github@matthiasm.com>
CommitDate: Wed Jan 26 17:17:24 2022 +0100

    Fix for #381, `backward` function crash
    
    when no menu item is selected.

 src/Fl_Menu.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git src/Fl_Menu.cxx src/Fl_Menu.cxx
index a9fe732..62fbd56 100644
--- src/Fl_Menu.cxx
+++ src/Fl_Menu.cxx
@@ -644,6 +644,9 @@ static int forward(int menu) { // go to next item in menu menu if possible
 }
 
 static int backward(int menu) { // previous item in menu menu if possible
+  // `menu` is -1 if no item is currently selected, we return 0
+  if (menu<0)
+    return 0;
   menustate &pp = *p;
   menuwindow &m = *(pp.p[menu]);
   int item = (menu == pp.menu_number) ? pp.item_number : m.selected;
@@ -719,7 +722,10 @@ int menuwindow::handle_part1(int e) {
     switch (Fl::event_key()) {
     case FL_BackSpace:
     BACKTAB:
-      if (!backward(pp.menu_number)) {pp.item_number = -1;backward(pp.menu_number);}
+      if (!backward(pp.menu_number)) {
+        pp.item_number = -1;
+        backward(pp.menu_number);
+      }
       return 1;
     case FL_Up:
       if (pp.menubar && pp.menu_number == 0) {
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.