summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Eskola <timo@tolleri.net>2018-09-01 22:17:22 +0300
committerTimo Eskola <timo@tolleri.net>2018-09-01 22:17:22 +0300
commit08f0cb51279c0ba868b2543e1447c2ab4123a433 (patch)
treef756c8ac5261945e44f1001c7056f8f867b609c3
parentd2f7e660b4648e592690e31dc298ae353298fdfe (diff)
parent11a3690450b830c9ecc448d783cab7e96327b266 (diff)
downloadvdr-plugin-duplicates-08f0cb51279c0ba868b2543e1447c2ab4123a433.tar.gz
vdr-plugin-duplicates-08f0cb51279c0ba868b2543e1447c2ab4123a433.tar.bz2
Merge branch 'master' into vdr2.4.0
-rw-r--r--HISTORY3
-rw-r--r--recording.c11
2 files changed, 11 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 3609abc..e31b9ac 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,9 +5,10 @@ VDR Plugin 'duplicates' Revision History
- Dropped support for VDR 2.2.0.
- Added scanner thread for duplicates.
-2018-08-31: Version 0.2.2
+2018-09-01: Version 0.2.2
- Updated kNone handling in main menu.
+- Improved duplicate recording copy constructor.
2018-08-30: Version 0.2.1
diff --git a/recording.c b/recording.c
index d318549..1555640 100644
--- a/recording.c
+++ b/recording.c
@@ -52,8 +52,15 @@ cDuplicateRecording::cDuplicateRecording(const cDuplicateRecording &DuplicateRec
fileName(DuplicateRecording.fileName),
text(DuplicateRecording.text),
title(DuplicateRecording.title),
- description(DuplicateRecording.description),
- duplicates(DuplicateRecording.duplicates) {}
+ description(DuplicateRecording.description) {
+ if (DuplicateRecording.duplicates != NULL) {
+ duplicates = new cList<cDuplicateRecording>;
+ for (const cDuplicateRecording *duplicate = DuplicateRecording.duplicates->First(); duplicate; duplicate = DuplicateRecording.duplicates->Next(duplicate)) {
+ duplicates->Add(new cDuplicateRecording(*duplicate));
+ }
+ } else
+ duplicates = NULL;
+}
cDuplicateRecording::~cDuplicateRecording() {
delete duplicates;