summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vdr.c b/vdr.c
index 87550de..dfaf5dc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
- * $Id: vdr.c 1.141 2003/01/26 11:56:31 kls Exp $
+ * $Id: vdr.c 1.143 2003/02/09 13:13:42 kls Exp $
*/
#include <getopt.h>
@@ -459,7 +459,7 @@ int main(int argc, char *argv[])
LastChannel = cDevice::CurrentChannel();
}
// Timers and Recordings:
- if (!Menu) {
+ if (!Timers.BeingEdited()) {
time_t Now = time(NULL); // must do both following calls with the exact same time!
cRecordControls::Process(Now);
cTimer *Timer = Timers.GetMatch(Now);
@@ -469,7 +469,7 @@ int main(int argc, char *argv[])
}
}
// CAM control:
- if (!Menu)
+ if (!Interface->IsOpen())
Menu = CamControl();
// User Input:
cOsdObject *Interact = Menu ? Menu : cControl::Control();