diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2015-02-16 07:54:21 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2015-02-16 07:54:21 +0100 |
| commit | d48355c30584585e1d2e881e9101650af66bab57 (patch) | |
| tree | b8251dba959ae600d4a26f16fc4a8ab9372f2f78 | |
| parent | 519ecddc529c4a4ac6290c5bbcb26d027ac56007 (diff) | |
| download | vdr-d48355c30584585e1d2e881e9101650af66bab57.tar.gz vdr-d48355c30584585e1d2e881e9101650af66bab57.tar.bz2 | |
Fixed using the default sort mode in a video directory without a ".sort" file
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | recording.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0c2434c5..1c466151 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3375,6 +3375,8 @@ Stefan Herdler <herdler@gmx.de> for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd() for reporting that pausing replay at the last editing mark actually paused one I-frame too early + for reporting a bug in using the default sort mode in a video directory without a + ".sort" file Tobias Faust <tobias.faust@gmx.de> for the original "jumpingseconds" patch @@ -8568,7 +8568,7 @@ Video Disk Recorder Revision History - Updated the French OSD texts (thanks to Régis Bossut). - Fixed the German translation of "Zap timeout" (thanks to Albert Danis). -2015-02-13: Version 2.2.0 +2015-02-16: Version 2.2.0 - Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras). - Updated the Macedonian OSD texts (thanks to Dimitar Petrovski). @@ -8582,3 +8582,5 @@ Video Disk Recorder Revision History - Fixed pausing replay at the last editing mark (reported by Stefan Herdler). - Updated the Polish OSD texts (thanks to Tomasz Maciej Nowak). - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). +- Fixed using the default sort mode in a video directory without a ".sort" file + (reported by Stefan Herdler). diff --git a/recording.c b/recording.c index 337d4a88..0a084140 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 3.27 2015/02/07 16:07:22 kls Exp $ + * $Id: recording.c 3.28 2015/02/16 07:49:14 kls Exp $ */ #include "recording.h" @@ -3027,6 +3027,7 @@ bool HasRecordingsSortMode(const char *Directory) void GetRecordingsSortMode(const char *Directory) { + RecordingsSortMode = rsmName; if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "r")) { char buf[8]; if (fgets(buf, sizeof(buf), f)) |