preserve labels after an edit action is aborted; extending the menu

struct just for this is the least intrusive approach until the menu code
is reviewed.

inspired by Thomas Pfaff's report on tech@

ok oga@
This commit is contained in:
okan
2010-02-10 01:23:05 +00:00
parent c4a97053cd
commit 507480a695
3 changed files with 8 additions and 5 deletions

View File

@@ -400,19 +400,19 @@ kbfunc_client_label(struct client_ctx *cc, union arg *arg)
{
struct menu *mi;
struct menu_q menuq;
char *current;
TAILQ_INIT(&menuq);
current = cc->label;
/* dummy is set, so this will always return */
mi = menu_filter(cc->sc, &menuq, "label", cc->label, 1,
search_match_text, NULL);
if ((mi = menu_filter(cc->sc, &menuq, "label", current, 1,
search_match_text, NULL)) != NULL) {
if (!mi->abort) {
if (cc->label != NULL)
xfree(cc->label);
cc->label = xstrdup(mi->text);
xfree(mi);
}
xfree(mi);
}
void