diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2003-09-14 09:38:44 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2003-09-14 09:38:44 +0200 |
| commit | 07bc699dca7e9cedf2cd1255765f0d0b661c3a97 (patch) | |
| tree | 3f391121e36c85783b9981a8464cabc11f8f3225 | |
| parent | ac4393b866b55c85b0357c7fd387311d594adf2b (diff) | |
| download | vdr-07bc699dca7e9cedf2cd1255765f0d0b661c3a97.tar.gz vdr-07bc699dca7e9cedf2cd1255765f0d0b661c3a97.tar.bz2 | |
Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | vdr.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 2a7b7ef7..357617c5 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -747,6 +747,7 @@ Jon Burgess <mplayer@jburgess.uklinux.net> Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> for reporting a crash when cancelling a newly created timer + for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated Michael Walle <michael.walle@web.de> for reporting a bug in channel switching after Left/Right has been pressed @@ -2376,7 +2376,7 @@ Video Disk Recorder Revision History is active (sometimes the CAMs got irritated when the device tuned to channels they couldn't handle). -2003-09-09: Version 1.2.5 +2003-09-14: Version 1.2.5 - Fixed dropping out of replay mode while viewing a recording that is still going on (thanks to Oliver Endriss for reporting and helping to debug this @@ -2387,3 +2387,5 @@ Video Disk Recorder Revision History - Removed the obsolete chapter "Stopping a recording on the primary DVB interface" from MANUAL. - Completed Dutch language texts (thanks to Hans Dingemans). +- Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated (thanks to + Thomas Schmidt). @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.168 2003/09/05 13:14:16 kls Exp $ + * $Id: vdr.c 1.169 2003/09/14 09:36:54 kls Exp $ */ #include <getopt.h> @@ -346,7 +346,7 @@ int main(int argc, char *argv[]) Setup.Load(AddDirectory(ConfigDirectory, "setup.conf")); if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) && - Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) && + Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC) && Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) && Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) && Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) && |