--- a/uifw/AvKon/src/transitionmanager.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AvKon/src/transitionmanager.cpp	Tue Aug 31 15:28:30 2010 +0300
@@ -421,7 +421,6 @@
 void CTransitionManager::KeyChangedL(const MKeyValue& aValue)
 	{
 	ASSERT(aValue.Key() == KThemesTransitionEffects);
-	aValue.Key(); // just for fixing warning
 	ASSERT(!(iFlags & EffectsEnabled));
 	CheckEffectsL(ETrue);
 
@@ -438,7 +437,7 @@
 			iFlags &= ~EffectsEnabled;	
 			iCRListen->Listen();
 			}
-		else
+		else if(!aWait || CServerWait::WaitL())
 			{
 			iFlags |= EffectsEnabled;	
 			}