diff --git a/HISTORY b/HISTORY index a24ccacc..81117f0a 100644 --- a/HISTORY +++ b/HISTORY @@ -6836,12 +6836,9 @@ Video Disk Recorder Revision History - Fixed frozen live view with device bonding in case the bonded master is used for live viewing (reported by Uwe Scheffler). -2012-01-25: Version 1.7.24 +2012-01-26: Version 1.7.24 - Updated the Italian OSD texts (thanks to Diego Pierotto). -- Revoked "Fixed handling symbolic links in cRecordings::ScanVideoDir()". - This change actually broke handling symbolic links (see - http://www.vdr-portal.de/board1-news/board2-vdr-news/p1047199-announce-vdr-developer-version-1-7-23/#post1047199). - Fixed a high load in case a transponder can't be received. - Improved the way DVB_API_VERSION is checked. - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). @@ -6852,3 +6849,5 @@ Video Disk Recorder Revision History - Some improvements to the Makefiles (thanks to Christian Ruppert). - Fixed cRecording::LengthInSeconds(), which wrongfully rounded the result to full minutes (thanks to Christoph Haubrich). +- Symbolic links are no longer resolved in cRecordings::ScanVideoDir() (thanks to + Sundararaj Reel). diff --git a/recording.c b/recording.c index 0d47d3f9..87886557 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 2.45 2012/01/25 09:32:39 kls Exp $ + * $Id: recording.c 2.46 2012/01/26 10:02:29 kls Exp $ */ #include "recording.h" @@ -1120,11 +1120,6 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev continue; } Link = 1; - buffer = ReadLink(buffer); - if (!*buffer) - continue; - if (stat(buffer, &st) != 0) - continue; } if (S_ISDIR(st.st_mode)) { if (endswith(buffer, deleted ? DELEXT : RECEXT)) {