From 10741c4c5447f042bdf365f36b258f2f7a2e5d39 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 29 Oct 2000 14:00:00 +0100
Subject: [PATCH] Fixed initializing the RCU code

---
 vdr.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/vdr.c b/vdr.c
index c8cabb0b..268f45b9 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.39 2000/10/08 14:49:25 kls Exp $
+ * $Id: vdr.c 1.40 2000/10/29 14:00:00 kls Exp $
  */
 
 #include <getopt.h>
@@ -161,10 +161,6 @@ int main(int argc, char *argv[])
   if (!cDvbApi::Init())
      abort();
 
-  // User interface:
-
-  Interface = new cInterface(SVDRPport);
-
   // Configuration data:
 
   if (!ConfigDirectory)
@@ -176,14 +172,21 @@ int main(int argc, char *argv[])
 #ifdef REMOTE_LIRC
   Keys.SetDummyValues();
 #else
-  if (!Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF)))
-     Interface->LearnKeys();
+  bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
 #endif
 
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
   Channels.SwitchTo(CurrentChannel);
 
+  // User interface:
+
+  Interface = new cInterface(SVDRPport);
+#ifndef REMOTE_LIRC
+  if (!KeysLoaded)
+     Interface->LearnKeys();
+#endif
+
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);