diff options
| author | louis <louis.braun@gmx.de> | 2016-05-30 05:29:15 +0200 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2016-05-30 05:29:15 +0200 |
| commit | 79623b657139ed0c73d6ff4d8e690c8752af3b31 (patch) | |
| tree | d530dba3e6ace2521b25e7e0a828aa7ab5efb8c5 /coreengine | |
| parent | 7b26d65360a5bb113dc6e3acea631ef1ea247be7 (diff) | |
| download | vdr-plugin-skindesigner-79623b657139ed0c73d6ff4d8e690c8752af3b31.tar.gz vdr-plugin-skindesigner-79623b657139ed0c73d6ff4d8e690c8752af3b31.tar.bz2 | |
fixed missing check for zapcockpit patch
Diffstat (limited to 'coreengine')
| -rw-r--r-- | coreengine/viewdisplaychannel.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/coreengine/viewdisplaychannel.c b/coreengine/viewdisplaychannel.c index 831a1b9..0702252 100644 --- a/coreengine/viewdisplaychannel.c +++ b/coreengine/viewdisplaychannel.c @@ -367,7 +367,12 @@ void cViewChannel::Close(void) { fader = NULL; delete shifter; shifter = NULL; - if (initFinished && viewType == dcDefault && ShiftTime() > 0) { + bool doAnim = true; +#ifdef USE_ZAPCOCKPIT + if (viewType != dcDefault) + doAnim = false; +#endif + if (initFinished && doAnim && ShiftTime() > 0) { cRect shiftbox = CoveredArea(); cPoint ref = cPoint(shiftbox.X(), shiftbox.Y()); cPoint end = ShiftStart(shiftbox); @@ -375,7 +380,7 @@ void cViewChannel::Close(void) { shifter->Shift(); delete shifter; shifter = NULL; - } else if (initFinished && viewType == dcDefault && FadeTime() > 0) { + } else if (initFinished && doAnim && FadeTime() > 0) { fader = new cAnimation((cFadable*)this, false); fader->Fade(); delete fader; |