From 7590af7afe23ecaace369801f312bba7d5366da7 Mon Sep 17 00:00:00 2001 From: wr61 Date: Wed, 12 Jan 2005 10:50:38 +0000 Subject: fixed partial checkin of kOK for start of CreateCollection git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@349 e10066b5-e1e2-0310-b819-94efdf66514b --- muggle-plugin/mg_actions.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/muggle-plugin/mg_actions.c b/muggle-plugin/mg_actions.c index b2e21f8..502b1f6 100644 --- a/muggle-plugin/mg_actions.c +++ b/muggle-plugin/mg_actions.c @@ -689,13 +689,18 @@ mgRemoveThisFromCollection::MenuName (const unsigned int idx,const string value) return b; } +bool +mgCreateCollection::Editing() +{ + return (strchr(cOsdItem::Text(),'[') && strchr(cOsdItem::Text(),']')); +} + void mgCreateCollection::Notify() { - if (!strchr(Text(),'[')) - if (!strchr(Text(),']')) - osd()->SetHelpKeys(NULL,NULL,NULL,NULL); + if (!Editing()) + osd()->SetHelpKeys(NULL,NULL,NULL,NULL); } const char* @@ -717,7 +722,10 @@ mgCreateCollection::ProcessKey(eKeys key) Execute(); else return cMenuEditStrItem::ProcessKey(kRight); - return cMenuEditStrItem::ProcessKey(key); + if (key != kYellow || Editing()) + return cMenuEditStrItem::ProcessKey(key); + else + return osUnknown; } bool -- cgit v1.2.3