summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--vdr.c10
3 files changed, 10 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c8f393bd..29104fbc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1174,6 +1174,8 @@ Marco Schlüßler <marco@lordzodiac.de>
for removing scaling coordinates in letterbox mode from cDvbSpu
for fixing a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling
for adding cPlayer::DeviceSetVideoDisplayFormat()
+ for making the setup not being saved in case of a fatal error, to keep the volume
+ level from being set to a wrong value
Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index a565f99f..d0b04d66 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3549,3 +3549,5 @@ Video Disk Recorder Revision History
- Removed converting byte order on big endian systems from cDvbOsd::Flush(),
which, according to Johannes Stezenbach and Paavo Hartikainen, is wrong.
- Added cPlayer::DeviceSetVideoDisplayFormat() (thanks to Marco Schlüßler).
+- No longer saving the setup in case of a fatal error, to keep the volume level
+ from being set to a wrong value (thanks to Marco Schlüßler).
diff --git a/vdr.c b/vdr.c
index 72975e3b..fe4c2ca2 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.203 2005/03/20 10:58:59 kls Exp $
+ * $Id: vdr.c 1.204 2005/05/22 11:20:22 kls Exp $
*/
#include <getopt.h>
@@ -940,9 +940,11 @@ Exit:
Remotes.Clear();
Audios.Clear();
Skins.Clear();
- Setup.CurrentChannel = cDevice::CurrentChannel();
- Setup.CurrentVolume = cDevice::CurrentVolume();
- Setup.Save();
+ if (ExitCode != 2) {
+ Setup.CurrentChannel = cDevice::CurrentChannel();
+ Setup.CurrentVolume = cDevice::CurrentVolume();
+ Setup.Save();
+ }
cDevice::Shutdown();
PluginManager.Shutdown();
ReportEpgBugFixStats();