1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Now displaying recordings in move as non-selectable

This commit is contained in:
Klaus Schmidinger 2017-12-10 13:04:38 +01:00
parent 1492f6dbc4
commit ea217de338
2 changed files with 11 additions and 4 deletions

View File

@ -9162,7 +9162,7 @@ Video Disk Recorder Revision History
a subdirectory.
- SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
2017-12-09: Version 2.3.9
2017-12-10: Version 2.3.9
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
@ -9226,4 +9226,6 @@ Video Disk Recorder Revision History
- The new setup option "OSD/Sorting direction for recordings" can be used to switch
the sequence in which recordings are presented in the "Recordings" menu between
ascending (oldest first) and descendeng (newest first) (thanks to Matthias Senzel).
- When moving recordings between volumes, the "Recordings" menu now displays those items
that have not yet been moved completely as non-selectable. This avoids situations
where trying to play such a recording might fail.

9
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 4.50 2017/12/09 14:14:46 kls Exp $
* $Id: menu.c 4.51 2017/12/10 12:50:23 kls Exp $
*/
#include "menu.h"
@ -2877,8 +2877,13 @@ cMenuRecordingItem::cMenuRecordingItem(const cRecording *Recording, int Level)
name = NULL;
totalEntries = newEntries = 0;
SetText(Recording->Title('\t', true, Level));
if (*Text() == '\t')
if (*Text() == '\t') // this is a folder
name = strdup(Text() + 2); // 'Text() + 2' to skip the two '\t'
else { // this is an actual recording
int Usage = Recording->IsInUse();
if ((Usage & ruDst) != 0 && (Usage & (ruMove | ruCopy)) != 0)
SetSelectable(false);
}
}
cMenuRecordingItem::~cMenuRecordingItem()