aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-06-16 10:01:21 +0100
committerThomas Adam <thomas@xteddy.org>2020-06-16 10:01:21 +0100
commiteb448daa1a07fa25a9928791cdc8411da271a9bc (patch)
treedf8e81d6e1895384dc83f59f536c51ad1af1baf6 /input.c
parent824efe7be47ff534d57da1ab66c3d0dfde86992d (diff)
parent1bf9555e4f1ad19e1e6f97ede6fb19808ff1c267 (diff)
downloadrtmux-eb448daa1a07fa25a9928791cdc8411da271a9bc.tar.gz
rtmux-eb448daa1a07fa25a9928791cdc8411da271a9bc.tar.bz2
rtmux-eb448daa1a07fa25a9928791cdc8411da271a9bc.zip
Merge branch 'obsd-master'
Diffstat (limited to 'input.c')
-rw-r--r--input.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/input.c b/input.c
index 46d8734d..a3850371 100644
--- a/input.c
+++ b/input.c
@@ -2347,7 +2347,7 @@ static void
input_exit_rename(struct input_ctx *ictx)
{
struct window_pane *wp = ictx->wp;
- struct options_entry *oe;
+ struct options_entry *o;
if (wp == NULL)
return;
@@ -2361,9 +2361,9 @@ input_exit_rename(struct input_ctx *ictx)
return;
if (ictx->input_len == 0) {
- oe = options_get_only(wp->window->options, "automatic-rename");
- if (oe != NULL)
- options_remove(oe);
+ o = options_get_only(wp->window->options, "automatic-rename");
+ if (o != NULL)
+ options_remove_or_default(o, -1, NULL);
return;
}
window_set_name(wp->window, ictx->input_buf);