summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2000-11-03 15:31:03 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2000-11-03 15:31:03 +0100
commit88253cfba73ed92f85af7be47b5d05f88226859b (patch)
tree5420c757ecc6f9521c9d5e67269e0bce294d4e58 /vdr.c
parentdd610898efd84b306988a4cd68efe6df0e0b878d (diff)
downloadvdr-88253cfba73ed92f85af7be47b5d05f88226859b.tar.gz
vdr-88253cfba73ed92f85af7be47b5d05f88226859b.tar.bz2
Reading setup.conf before initializing DVB devices (didn't set system time)
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c12
1 files 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);