aboutsummaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-10-30 14:01:20 +0000
committerThomas Adam <thomas@xteddy.org>2020-10-30 14:01:20 +0000
commitd0640609044c06ffa5aeb7a509965ce3f0b1a412 (patch)
tree81f337a88897a8dd7e7f5a9913ee926f7e764318 /menu.c
parent0b8ae4de5c38210d9a3ac6d003726f7cab89f285 (diff)
parent9726c4454e29cb5b9c6681abfb5c99972a9bd574 (diff)
downloadrtmux-d0640609044c06ffa5aeb7a509965ce3f0b1a412.tar.gz
rtmux-d0640609044c06ffa5aeb7a509965ce3f0b1a412.tar.bz2
rtmux-d0640609044c06ffa5aeb7a509965ce3f0b1a412.zip
Merge branch 'obsd-master'
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/menu.c b/menu.c
index 3bd56ab1..48c9ed2f 100644
--- a/menu.c
+++ b/menu.c
@@ -315,10 +315,11 @@ chosen:
if (md->choice == -1)
return (1);
item = &menu->items[md->choice];
- if ((md->flags & MENU_STAYOPEN) && item->name == NULL)
- return (0);
- if (item->name == NULL || *item->name == '-')
+ if (item->name == NULL || *item->name == '-') {
+ if (md->flags & MENU_STAYOPEN)
+ return (0);
return (1);
+ }
if (md->cb != NULL) {
md->cb(md->menu, md->choice, item->key, md->data);
md->cb = NULL;