frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
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

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-04-27 10:06:49 +02:00
parent 53ef55410c
commit fd3bf6c3d2
3 changed files with 13 additions and 8 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 fixing the type of MBperMinute in cVideoDiskUsage::HasChanged()
for reporting a bug in sorting recordings in case two folders have the same name, 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" 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 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 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>) Olivier Jacques <jacquesolivier@hotmail.com>)
for translating OSD texts to the French language for translating OSD texts to the French language

7
HISTORY
View File

@ -7796,7 +7796,7 @@ Video Disk Recorder Revision History
improve overall performance when an editing process is running (thanks to Jochen improve overall performance when an editing process is running (thanks to Jochen
Dolze). Dolze).
2013-04-11: Version 2.1.1 2013-04-27: Version 2.1.1
- Fixed initializing cDevice::keepTracks. - Fixed initializing cDevice::keepTracks.
- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than - Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
@ -7812,3 +7812,8 @@ Video Disk Recorder Revision History
- Changed the sign of the satellite position value in cSource to reflect the standard - Changed the sign of the satellite position value in cSource to reflect the standard
of western values being negative. The new member function cSource::Position() can be of western values being negative. The new member function cSource::Position() can be
used to retrieve the orbital position of a satellite. used to retrieve the orbital position of a satellite.
- 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).

10
menu.c
View File

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