frodovdr
/
vdr-plugin-skindesigner
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed bug that currentelement is not flushed if fadetime = 0

This commit is contained in:
louis 2016-02-21 15:09:35 +01:00
parent 803143ae3a
commit 0aab775201
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreengine/animation.c
View File

@ -198,11 +198,12 @@ void cAnimation::Scroll(void) {
void cAnimation::Detach(void) { void cAnimation::Detach(void) {
if (waitOnWakeup) { if (waitOnWakeup) {
Wait(); Wait();
int delay = 100 + detachable->Delay(); int delay = 50 + detachable->Delay();
Sleep(delay); Sleep(delay);
} else { } else {
int delay = detachable->Delay(); int delay = detachable->Delay();
Sleep(delay); if (delay > 0)
Sleep(delay);
} }
if (!Running()) return; if (!Running()) return;
detachable->ParseDetached(); detachable->ParseDetached();

3
coreengine/viewelement.c
View File

@ -463,7 +463,8 @@ bool cViewElement::Parse(bool forced) {
return true; return true;
} }
delete detacher; delete detacher;
detacher = new cAnimation((cDetachable*)this, waitOnWakeup, startAnimation); bool isAnimated = (FadeTime() > 0) || (ShiftTime() > 0);
detacher = new cAnimation((cDetachable*)this, waitOnWakeup, startAnimation && isAnimated);
detacher->Start(); detacher->Start();
startAnimation = false; startAnimation = false;
init = false; init = false;