From f6233828fea02a1d62b6ff4d2bc9fd12469ba04c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 17 Mar 2011 20:02:52 +0100 Subject: [PATCH] Initialize variables in ctor The not initialized boolean value seemed to have evaluated to true and causing the animation to stop and therefore the darkening not to apply. Giving a default value to the EffectWindow pointer doesn't hurt either. Patch does not apply to 4.6 branch, because of that only in master. BUG: 264552 FIXED-IN: 4.7.0 --- effects/dashboard/dashboard.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/effects/dashboard/dashboard.cpp b/effects/dashboard/dashboard.cpp index 44f59998b7..5289a8050b 100644 --- a/effects/dashboard/dashboard.cpp +++ b/effects/dashboard/dashboard.cpp @@ -29,6 +29,8 @@ DashboardEffect::DashboardEffect() : transformWindow(false) , activateAnimation(false) , deactivateAnimation(false) + , retransformWindow(false) + , window(NULL) { // propagate that the effect is loaded propagate(); @@ -114,6 +116,7 @@ void DashboardEffect::postPaintScreen() retransformWindow = false; transformWindow = false; effects->addRepaintFull(); + window = NULL; effects->setActiveFullScreenEffect(0); } @@ -128,6 +131,7 @@ void DashboardEffect::postPaintScreen() if (timeline.currentValue() == 0.0) { deactivateAnimation = false; transformWindow = false; + window = NULL; effects->setActiveFullScreenEffect(0); }