aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornicm <nicm>2021-11-01 07:48:04 +0000
committernicm <nicm>2021-11-01 07:48:04 +0000
commit4fe5aa99fb203ddb25089955d8814e1065e11a60 (patch)
tree46c0f54631ee52b914dd642e091db2a36a65262c
parent4acad43013b7bb5f91103a68cfce591b1980ae17 (diff)
downloadrtmux-4fe5aa99fb203ddb25089955d8814e1065e11a60.tar.gz
rtmux-4fe5aa99fb203ddb25089955d8814e1065e11a60.tar.bz2
rtmux-4fe5aa99fb203ddb25089955d8814e1065e11a60.zip
Fix a comparison, from Ben Boeckel, and a crash when opening completion
menu, from Anindya Mukherjee.
-rw-r--r--colour.c2
-rw-r--r--status.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/colour.c b/colour.c
index 92bbd71e..6ede25da 100644
--- a/colour.c
+++ b/colour.c
@@ -115,7 +115,7 @@ colour_force_rgb(int c)
return (colour_256toRGB(c));
if (c >= 0 && c <= 7)
return (colour_256toRGB(c));
- if (c >= 90 & c <= 97)
+ if (c >= 90 && c <= 97)
return (colour_256toRGB(8 + c - 90));
return (-1);
}
diff --git a/status.c b/status.c
index 65c81386..d499eab8 100644
--- a/status.c
+++ b/status.c
@@ -1727,7 +1727,7 @@ status_prompt_complete_list_menu(struct client *c, char **list, u_int size,
item.name = list[i];
item.key = '0' + (i - spm->start);
item.command = NULL;
- menu_add_item(menu, &item, NULL, NULL, NULL);
+ menu_add_item(menu, &item, NULL, c, NULL);
}
if (options_get_number(c->session->options, "status-position") == 0)