mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
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
This commit is contained in:
parent
f8b6b2cf1b
commit
6972a59e1b
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -85,6 +85,5 @@ void cSDDisplayReplay::SetMessage(eMessageType Type, const char *Text) {
|
||||
void cSDDisplayReplay::Flush(void) {
|
||||
if (!ok)
|
||||
return;
|
||||
view->GetTimers();
|
||||
view->Flush();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user