summary refs log tree commit diff
path: root/menu.c
diff options
context:
space:
mode:
authorokan <okan>2010-02-10 01:23:05 +0000
committerokan <okan>2010-02-10 01:23:05 +0000
commit507480a69503bd3a5924ebd8cc2e9a971efe62d9 (patch)
tree3de6541fa3cbf8d2406b2a932f40b79e2931fb64 /menu.c
parentc4a97053cd98160c9e0f55e2b7fb71de73616579 (diff)
downloadcwm-507480a69503bd3a5924ebd8cc2e9a971efe62d9.tar.gz
cwm-507480a69503bd3a5924ebd8cc2e9a971efe62d9.tar.xz
cwm-507480a69503bd3a5924ebd8cc2e9a971efe62d9.zip
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@
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/menu.c b/menu.c
index 96d6556..6b462be 100644
--- a/menu.c
+++ b/menu.c
@@ -223,6 +223,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 			    mc->searchstr, sizeof(mi->text));
 			mi->dummy = 1;
 		}
+		mi->abort = 0;
 		return (mi);
 	case CTL_WIPE:
 		mc->searchstr[0] = '\0';
@@ -235,6 +236,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 		mi = xmalloc(sizeof *mi);
 		mi->text[0] = '\0';
 		mi->dummy = 1;
+		mi->abort = 1;
 		return (mi);
 	default:
 		break;