summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-04-12 13:59:34 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-04-12 13:59:34 +0200
commitbd233752488dc28a81137e45d177f77177ba10e2 (patch)
treea19a07a8cbdb1eded784bf8cb4d862deb941c342
parent08c96c2f0db8b6abf00770b5a889cda1131b12e8 (diff)
downloadvdr-bd233752488dc28a81137e45d177f77177ba10e2.tar.gz
vdr-bd233752488dc28a81137e45d177f77177ba10e2.tar.bz2
The 'epg.data' file is now read after all plugins have been started
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--vdr.c6
3 files changed, 6 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2dd3d0bb..d8b87945 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -573,6 +573,7 @@ Florian Bartels <Florian.Bartels@envisage.de>
Sascha Volkenandt <sascha@akv-soft.de>
for helping to fix a faulty behaviour of the "Mute" key in case the channel display
is visible
+ for making the 'epg.data' file being read after all plugins have been started
Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
for modifying LOF handling to allow for C-band reception
diff --git a/HISTORY b/HISTORY
index 962a9f8a..2d76387f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2026,3 +2026,5 @@ Video Disk Recorder Revision History
is now used as primary device (just to have some device).
- Adjusted some Premiere channels in 'channels.conf' (thanks to Thomas Koch).
- Updated 'channels.conf.cable' (thanks to Stefan Hußfeldt).
+- The 'epg.data' file is now read after all plugins have been started (thanks
+ to Sascha Volkenandt).
diff --git a/vdr.c b/vdr.c
index f05ecfa0..3f0a7f0d 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.148 2003/04/12 12:17:32 kls Exp $
+ * $Id: vdr.c 1.149 2003/04/12 13:57:45 kls Exp $
*/
#include <getopt.h>
@@ -354,8 +354,6 @@ int main(int argc, char *argv[])
cDvbDevice::Initialize();
- cSIProcessor::Read();
-
// Start plugins:
if (!PluginManager.StartPlugins())
@@ -427,6 +425,8 @@ int main(int argc, char *argv[])
cEITScanner EITScanner;
+ cSIProcessor::Read();
+
// Signal handlers:
if (signal(SIGHUP, SignalHandler) == SIG_IGN) signal(SIGHUP, SIG_IGN);