summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-10-13 09:16:32 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2002-10-13 09:16:32 +0200
commita19ea98ccebd17231be9c480fd187bdee1bf9fd1 (patch)
tree5045ada5f75eaef9ffca00535b870b2d461a9bc7
parente2aee54d1279c0605a0ed5db43ce29e3079a8ad6 (diff)
downloadvdr-a19ea98ccebd17231be9c480fd187bdee1bf9fd1.tar.gz
vdr-a19ea98ccebd17231be9c480fd187bdee1bf9fd1.tar.bz2
Automatically closing 'Commands' menu if command doesn't return any output
-rw-r--r--HISTORY2
-rw-r--r--menu.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 0d3f615e..8182d284 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1603,3 +1603,5 @@ Video Disk Recorder Revision History
title, which will result in a confirmation prompt before executing the
command.
- Changed a few leftover 'new char[...]' to MALLOC(char, ...).
+- If a command executed from the "Commands" menu doesn't return any output, the
+ OSD will now be closed automatically.
diff --git a/menu.c b/menu.c
index 786e1398..bdf7dba7 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.215 2002/10/13 08:44:33 kls Exp $
+ * $Id: menu.c 1.216 2002/10/13 09:15:26 kls Exp $
*/
#include "menu.h"
@@ -2093,6 +2093,7 @@ eOSState cMenuCommands::Execute(void)
const char *Result = command->Execute();
if (Result)
return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
+ return osEnd;
}
}
return osContinue;