From: RisingThumb <aaronleonard@risingthumb.xyz>
Date: Tue, 22 Sep 2020 21:41:16 +0000 (+0100)
Subject: Fix loop around for number keys
X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/commitdiff_plain/02511d092bbf97f19beac22fa5731ff29b818d73

Fix loop around for number keys
---

diff --git a/xmenu.c b/xmenu.c
index e74c3c7..c29c31d 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -1281,14 +1281,15 @@ selectitem:
 			} else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) {
 				item = itemcycle(currmenu, ITEMNEXT);
 			} else if (ksym >= XK_1 && ksym <= XK_9){
-                                item = itemcycle(currmenu, ITEMFIRST);
-                                currmenu->selected = item;
-                                for(int i = ksym-XK_1; i > 0; i-=1){
-                                    item = itemcycle(currmenu, ITEMNEXT);
-                                    currmenu->selected = item;
-                                }
-                        } else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) &&
-			           currmenu->selected != NULL) {
+				item = itemcycle(currmenu, ITEMFIRST);
+				for(int i = ksym-XK_1; i > 0; i-=1){
+					currmenu->selected = item;
+					item = itemcycle(currmenu, ITEMNEXT);
+					if (item == itemcycle(currmenu, ITEMLAST))
+						break;
+				}
+			} else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) &&
+			            currmenu->selected != NULL) {
 				item = currmenu->selected;
 				goto selectitem;
 			} else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) &&