summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-11-04 13:52:31 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2005-11-04 13:52:31 +0100
commit159c7e283d8cf14fc676a6278cace9c88212c3e2 (patch)
tree5c8070fafd5ffe01e1888dc5b8c7bd9213a3e682 /vdr.c
parent23ee5bb4da71c7fa419bc8ad14f4d896ed6e6f2d (diff)
downloadvdr-159c7e283d8cf14fc676a6278cace9c88212c3e2.tar.gz
vdr-159c7e283d8cf14fc676a6278cace9c88212c3e2.tar.bz2
A menu is no longer automatically closed when a replay ends
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/vdr.c b/vdr.c
index 9d84d84e..5cf73751 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.218 2005/10/09 10:01:45 kls Exp $
+ * $Id: vdr.c 1.219 2005/11/04 13:48:39 kls Exp $
*/
#include <getopt.h>
@@ -813,8 +813,14 @@ int main(int argc, char *argv[])
if (Interact) {
eOSState state = Interact->ProcessKey(key);
if (state == osUnknown && Interact != cControl::Control()) {
- if (ISMODELESSKEY(key) && cControl::Control())
+ if (ISMODELESSKEY(key) && cControl::Control()) {
state = cControl::Control()->ProcessKey(key);
+ if (state == osEnd) {
+ // let's not close a menu when replay ends:
+ cControl::Shutdown();
+ continue;
+ }
+ }
else if (time(NULL) - LastActivity > MENUTIMEOUT)
state = osEnd;
}