--- a/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/src/alfserverdrawer.cpp	Wed May 26 16:47:36 2010 +0300
+++ b/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/src/alfserverdrawer.cpp	Tue Jun 08 13:16:48 2010 +0300
@@ -944,9 +944,10 @@
 
     iFullScreenFinished = EFalse;
     iFullScreenTimeout->iIsStartEffect = EFalse;
+ 	
     if (triggerStartEffectTimeout)
         {
-        return KErrNone;
+        //return KErrNone;  // even long app start effects need some hardcore timeout
         }
     if ( iAction == AknTransEffect::EApplicationExit /*||
         iAction == 1001*/  ) 
@@ -958,7 +959,7 @@
         {
         iFinishFullScreen->Start( KAlfLongEffectTimeout, TCallBack( FinishFullScreenTimeout, this ) );
         }
-    return KErrNone;
+    return triggerStartEffectTimeout;
     }
 
 // ---------------------------------------------------------------------------
@@ -975,7 +976,8 @@
         }
 
     iFullScreenTransitionEndObserver->Cancel();
-    
+    iFinishFullScreen->Cancel();
+    iFullScreenTimeout->Cancel();
     iFullScreenFxSent = EFalse;
     iFullScreenEndSent = ETrue;