From 1cd140d5dc1da4311b3d84da38fbc311535c5ee8 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 5 Jul 2001 23:27:01 +0000 Subject: [PATCH] * main.c (midnight_callback): Don't handle any events except Ctrl-x combinations on DLG_KEY event if the menu is active. --- src/ChangeLog | 3 +++ src/main.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d0faf5d64..76195af50 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2001-07-05 Pavel Roskin + * main.c (midnight_callback): Don't handle any events except + Ctrl-x combinations on DLG_KEY event if the menu is active. + * main.c (load_prompt): Don't change prompt if midnight_dlg is not the current dialog. diff --git a/src/main.c b/src/main.c index 7ffc60756..02affc9a5 100644 --- a/src/main.c +++ b/src/main.c @@ -1994,7 +1994,11 @@ midnight_callback (struct Dlg_head *h, int id, int msg) } #ifndef HAVE_X - if (id == KEY_F(10) && !the_menubar->active){ + /* FIXME: should handle all menu shortcuts before this point */ + if (the_menubar->active) + break; + + if (id == KEY_F(10)){ quit_cmd (); return MSG_HANDLED; }