From 88253cfba73ed92f85af7be47b5d05f88226859b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 3 Nov 2000 15:31:03 +0100
Subject: [PATCH] Reading setup.conf before initializing DVB devices (didn't
 set system time)

---
 vdr.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vdr.c b/vdr.c
index b1321aef..ee98b6b4 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.41 2000/11/01 14:31:32 kls Exp $
+ * $Id: vdr.c 1.42 2000/11/03 15:31:03 kls Exp $
  */
 
 #include <getopt.h>
@@ -156,11 +156,6 @@ int main(int argc, char *argv[])
      }
   isyslog(LOG_INFO, "VDR version %s started", VDRVERSION);
 
-  // DVB interfaces:
-
-  if (!cDvbApi::Init())
-     abort();
-
   // Configuration data:
 
   if (!ConfigDirectory)
@@ -175,6 +170,11 @@ int main(int argc, char *argv[])
   bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
 #endif
 
+  // DVB interfaces:
+
+  if (!cDvbApi::Init())
+     abort();
+
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
   Channels.SwitchTo(CurrentChannel);