summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2000-09-20 16:49:49 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2000-09-20 16:49:49 +0200
commitd991a8c702363b37c033ad4ec7689f1235f9e0c8 (patch)
treebb1d92cd5edddfd9bb54d0aba0bf3d86e5983aef
parent9600eaf3f16b6ba4358b15a1e152bdae8389a5cb (diff)
downloadvdr-d991a8c702363b37c033ad4ec7689f1235f9e0c8.tar.gz
vdr-d991a8c702363b37c033ad4ec7689f1235f9e0c8.tar.bz2
No more daemon mode with REMOTE=KBD
-rw-r--r--HISTORY5
-rw-r--r--vdr.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index e91dae48..b68ce986 100644
--- a/HISTORY
+++ b/HISTORY
@@ -168,7 +168,7 @@ Video Disk Recorder Revision History
entered so far together with the name of that channel are displayed on the
OSD (suggested by Martin Hammerschmid).
-2000-09-19: Version 0.64
+2000-09-20: Version 0.64
- NOTE: If you are using DVB driver version 0.7 you need to load the dvb.o
module with option outstream=0, so your insmod statement should read
@@ -201,3 +201,6 @@ Video Disk Recorder Revision History
- Fixed a buffer overflow in EIT parsing.
- Added a security warning regarding SVDRP to the INSTALL file.
- Fixed 'confirm' dialog.
+- The daemon mode (option '-d') now no longer works with REMOTE=KBD (there
+ is no stdin in daemon mode, so KBD makes no sense - plus it sometimes
+ crashed).
diff --git a/vdr.c b/vdr.c
index 14cf8068..91643c2f 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.34 2000/09/18 22:29:56 kls Exp $
+ * $Id: vdr.c 1.35 2000/09/20 16:45:01 kls Exp $
*/
#include <getopt.h>
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
// Daemon mode:
if (DaemonMode) {
-#ifndef DEBUG_OSD
+#if !defined(DEBUG_OSD) && !defined(REMOTE_KBD)
pid_t pid = fork();
if (pid < 0) {
fprintf(stderr, "%s\n", strerror(errno));
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
fclose(stdout);
fclose(stderr);
#else
- fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD on!\n");
+ fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD or REMOTE_KBD on!\n");
abort();
#endif
}