summaryrefslogtreecommitdiffstats
path: root/libmenu/menu_cmdlist.c
diff options
context:
space:
mode:
authorulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-28 03:45:01 +0000
committerulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-28 03:45:01 +0000
commit1fbd5fb5f419b3a8512c265c45a7e26093b2020f (patch)
treed31851b2f0093f1fc1647b02f7b9ecf113121829 /libmenu/menu_cmdlist.c
parent1686f19335020455a871027611bc1d7d6da486d5 (diff)
downloadmpv-1fbd5fb5f419b3a8512c265c45a7e26093b2020f.tar.bz2
mpv-1fbd5fb5f419b3a8512c265c45a7e26093b2020f.tar.xz
Remove redundant option 'auto-close' from cmdlist and filesel.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25533 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu/menu_cmdlist.c')
-rw-r--r--libmenu/menu_cmdlist.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c
index b8ccb8b93d..ab7cbeb3a9 100644
--- a/libmenu/menu_cmdlist.c
+++ b/libmenu/menu_cmdlist.c
@@ -35,20 +35,17 @@ struct list_entry_s {
struct menu_priv_s {
menu_list_priv_t p;
- int auto_close;
};
#define ST_OFF(m) M_ST_OFF(struct menu_priv_s, m)
static struct menu_priv_s cfg_dflt = {
MENU_LIST_PRIV_DFLT,
- 0,
};
static m_option_t cfg_fields[] = {
MENU_LIST_PRIV_FIELDS,
{ "title",M_ST_OFF(struct menu_priv_s,p.title), CONF_TYPE_STRING, 0, 0, 0, NULL },
- { "auto-close", ST_OFF(auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL },
{ NULL, NULL, NULL, 0,0,0,NULL }
};
@@ -62,13 +59,8 @@ static void read_cmd(menu_t* menu,int cmd) {
break;
} // fallback on ok if right is not defined
case MENU_CMD_OK:
- if(mpriv->p.current->ok) {
- if (mp_input_parse_and_queue_cmds(mpriv->p.current->ok))
- {
- if (mpriv->auto_close)
- mp_input_queue_cmd (mp_input_parse_cmd ("menu hide"));
- }
- }
+ if (mpriv->p.current->ok)
+ mp_input_parse_and_queue_cmds(mpriv->p.current->ok);
break;
case MENU_CMD_LEFT:
if(mpriv->p.current->left) {