frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

No longer saving the setup in case of a fatal error

This commit is contained in:
Klaus Schmidinger 2005-05-22 11:23:22 +02:00
parent 710f6c37d1
commit 6b25832913
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1174,6 +1174,8 @@ Marco Schl
for removing scaling coordinates in letterbox mode from cDvbSpu for removing scaling coordinates in letterbox mode from cDvbSpu
for fixing a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling for fixing a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling
for adding cPlayer::DeviceSetVideoDisplayFormat() 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> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

2
HISTORY
View File

@ -3549,3 +3549,5 @@ Video Disk Recorder Revision History
- Removed converting byte order on big endian systems from cDvbOsd::Flush(), - Removed converting byte order on big endian systems from cDvbOsd::Flush(),
which, according to Johannes Stezenbach and Paavo Hartikainen, is wrong. which, according to Johannes Stezenbach and Paavo Hartikainen, is wrong.
- Added cPlayer::DeviceSetVideoDisplayFormat() (thanks to Marco Schlüßler). - 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).

10
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * 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> #include <getopt.h>
@ -940,9 +940,11 @@ Exit:
Remotes.Clear(); Remotes.Clear();
Audios.Clear(); Audios.Clear();
Skins.Clear(); Skins.Clear();
Setup.CurrentChannel = cDevice::CurrentChannel(); if (ExitCode != 2) {
Setup.CurrentVolume = cDevice::CurrentVolume(); Setup.CurrentChannel = cDevice::CurrentChannel();
Setup.Save(); Setup.CurrentVolume = cDevice::CurrentVolume();
Setup.Save();
}
cDevice::Shutdown(); cDevice::Shutdown();
PluginManager.Shutdown(); PluginManager.Shutdown();
ReportEpgBugFixStats(); ReportEpgBugFixStats();