diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2013-12-27 08:46:17 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2013-12-27 08:46:17 +0100 |
| commit | 089b5eb212e350079c4096dcc2634b03abadc227 (patch) | |
| tree | 89359a30d6c6a076f3b0fc47cc32647b7dd3f82c | |
| parent | 7c877edd2dcce10a8b83684290747b9af3897006 (diff) | |
| download | vdr-089b5eb212e350079c4096dcc2634b03abadc227.tar.gz vdr-089b5eb212e350079c4096dcc2634b03abadc227.tar.bz2 | |
Avoiding double entries when externally renaming a recording
| -rw-r--r-- | recording.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/recording.c b/recording.c index f2577ab9..b91a3cb3 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 3.9 2013/12/24 14:32:29 kls Exp $ + * $Id: recording.c 3.10 2013/12/27 08:46:17 kls Exp $ */ #include "recording.h" @@ -1392,6 +1392,7 @@ void cRecordings::Refresh(bool Foreground) void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel, int DirLevel) { + bool DoChangeState = false; // Find any new recordings: cReadDir d(DirName); struct dirent *e; @@ -1420,7 +1421,10 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev r->deleted = time(NULL); Lock(); Add(r); - ChangeState(); + if (initial) + ChangeState(); + else + DoChangeState = true; Unlock(); } else @@ -1441,11 +1445,13 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev Lock(); Del(r, false); VanishedRecordings.Add(r); - ChangeState(); + DoChangeState = true; Unlock(); } } } + if (DoChangeState) + ChangeState(); } bool cRecordings::StateChanged(int &State) |