summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-02-04 19:41:24 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2001-02-04 19:41:24 +0100
commit484a3afa89e81e5106108e2ba9eb9d45dcd27c9a (patch)
treec526cb11733665786e2126e6c51162b0cb6374c4 /vdr.c
parentbb03fa2a0ca2ef13f58abbea98f50ddc9291f1a5 (diff)
downloadvdr-484a3afa89e81e5106108e2ba9eb9d45dcd27c9a.tar.gz
vdr-484a3afa89e81e5106108e2ba9eb9d45dcd27c9a.tar.bz2
Fixed handling of REMOTE=NONE
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vdr.c b/vdr.c
index 715df223..ead90e5b 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.51 2001/02/04 11:51:11 kls Exp $
+ * $Id: vdr.c 1.52 2001/02/04 19:41:24 kls Exp $
*/
#include <getopt.h>
@@ -180,9 +180,9 @@ int main(int argc, char *argv[])
Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
-#ifdef REMOTE_LIRC
+#if defined(REMOTE_LIRC)
Keys.SetDummyValues();
-#else
+#elif !defined(REMOTE_NONE)
bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
#endif
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
// User interface:
Interface = new cInterface(SVDRPport);
-#ifndef REMOTE_LIRC
+#if !defined(REMOTE_LIRC) && !defined(REMOTE_NONE)
if (!KeysLoaded)
Interface->LearnKeys();
#endif