Fixed using the default sort mode in a video directory without a ".sort" file

This commit is contained in:
Klaus Schmidinger 2015-02-16 07:54:21 +01:00
parent 519ecddc52
commit d48355c305
3 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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).

View File

@ -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))