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

Fixed multiple occurrences of the same directory in the recordings list in case there are directories that only differ in non-alphanumeric characters

This commit is contained in:
Klaus Schmidinger 2013-04-27 10:18:08 +02:00
parent 2266b0e633
commit cffde6ee09
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -1013,9 +1013,11 @@ Andreas Mair <amair.sob@googlemail.com>
for fixing the type of MBperMinute in cVideoDiskUsage::HasChanged()
for reporting a bug in sorting recordings in case two folders have the same name,
but one of them ends in an additional digit, as in "abc" and "abc2"
for reporting multiple occurrences of the same directory in the recordings list ini
for reporting multiple occurrences of the same directory in the recordings list in
case there are directories that only differ in non-alphanumeric characters
for reporting a problem with reduced number of retries in Transfer Mode on SD-FF cards
for fixing multiple occurrences of the same directory in the recordings list in case
there are directories that only differ in non-alphanumeric characters
Olivier Jacques <jacquesolivier@hotmail.com>)
for translating OSD texts to the French language

8
HISTORY
View File

@ -7794,3 +7794,11 @@ Video Disk Recorder Revision History
- Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
improve overall performance when an editing process is running (thanks to Jochen
Dolze).
2013-04-27: Version 2.0.2
- Fixed multiple occurrences of the same directory in the recordings list in case there
are directories that only differ in non-alphanumeric characters (was broken by
"Fixed selecting the last replayed recording in the Recordings menu in case there
are folders and plain recordings with names that differ only in non-alphanumeric
characters" in version 1.7.36).

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 2.76.1.1 2013/04/05 10:41:32 kls Exp $
* $Id: config.h 2.76.1.2 2013/04/27 10:18:08 kls Exp $
*/
#ifndef __CONFIG_H
@ -22,8 +22,8 @@
// VDR's own version number:
#define VDRVERSION "2.0.1"
#define VDRVERSNUM 20001 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "2.0.2"
#define VDRVERSNUM 20002 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:

10
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 2.82 2013/03/18 09:11:48 kls Exp $
* $Id: menu.c 2.82.1.1 2013/04/27 10:15:16 kls Exp $
*/
#include "menu.h"
@ -2302,14 +2302,12 @@ void cMenuRecordings::Set(bool Refresh)
}
else
delete Item;
if (LastItem) {
if (LastItem || LastDir) {
if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
SetCurrent(LastItem);
SetCurrent(LastDir ? LastDir : LastItem);
}
if (LastDir) {
if (LastDir)
LastDir->IncrementCounter(recording->IsNew());
LastItem = LastDir;
}
}
}
if (Refresh)