summaryrefslogtreecommitdiff
path: root/coreengine
diff options
context:
space:
mode:
authorkamel5 <vdr.kamel5 (at) gmx (dot) net>2021-02-08 10:58:00 +0100
committerkamel5 <vdr.kamel5 (at) gmx (dot) net>2021-02-08 11:05:51 +0100
commit6972a59e1b86989167fb3f3b2b1dc02612d72b4a (patch)
treeff8a8453f741245b90c383b146108debd636a795 /coreengine
parentf8b6b2cf1b7263661e71fdd6c425891e6e74a103 (diff)
downloadvdr-plugin-skindesigner-6972a59e1b86989167fb3f3b2b1dc02612d72b4a.tar.gz
vdr-plugin-skindesigner-6972a59e1b86989167fb3f3b2b1dc02612d72b4a.tar.bz2
A bug with timeshift in connection with global timers has been fixed
With commit 8a04a17 an error was introduced which did not take the global timers into account in the timeshift replay. thanks to @machtnix at vdr-portal.de for finding the bug
Diffstat (limited to 'coreengine')
-rw-r--r--coreengine/viewdisplayreplay.c3
-rw-r--r--coreengine/viewdisplayreplay.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/coreengine/viewdisplayreplay.c b/coreengine/viewdisplayreplay.c
index b89edc5..f871afb 100644
--- a/coreengine/viewdisplayreplay.c
+++ b/coreengine/viewdisplayreplay.c
@@ -182,7 +182,7 @@ void cViewReplay::SetRecording(const cRecording *recording) {
}
}
-void cViewReplay::GetTimers(void) {
+void cViewReplay::GetGlobalTimers(void) {
if (!timersLoaded) {
timersLoaded = true;
globalTimers.LoadTimers();
@@ -198,6 +198,7 @@ void cViewReplay::SetTimeShiftValues(const cRecording *recording) {
if (usage & ruTimer)
isTimeShift = true;
else {
+ GetGlobalTimers();
if (globalTimers.IsRecording(recording))
isTimeShift = true;
}
diff --git a/coreengine/viewdisplayreplay.h b/coreengine/viewdisplayreplay.h
index 9098275..0dc682a 100644
--- a/coreengine/viewdisplayreplay.h
+++ b/coreengine/viewdisplayreplay.h
@@ -32,6 +32,7 @@ private:
cString timeShiftDuration;
bool timersLoaded;
cGlobalTimers globalTimers;
+ void GetGlobalTimers(void);
void SetViewElements(void);
void ClearVariables(void);
void SetViewElementObjects(void);
@@ -45,7 +46,6 @@ public:
void SetTimeShift(int framesTotal, int timeShiftLength);
void SetRecording(const cRecording *recording);
void SetTitle(const char *title);
- void GetTimers(void);
void SetTimeShiftValues(const cRecording *recording);
void SetCurrent(const char *current);
void SetTotal(const char *total);