--- a/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp	Wed Jun 09 09:21:41 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp	Mon Jun 21 15:19:37 2010 +0300
@@ -161,7 +161,15 @@
   delete iViewFinderBackup;
   iViewFinderBackup = NULL;
   iReceivedVfFrame = EFalse;
-
+  if( iIndBlinkTimer ) 
+    {
+    if( iIndBlinkTimer->IsActive() )
+      {
+      iIndBlinkTimer->Cancel();
+      }
+    delete iIndBlinkTimer;
+    iIndBlinkTimer = NULL;
+    }
   PRINT( _L("Camera <= ~CCamPreCaptureContainerBase" ))
   }
 
@@ -674,6 +682,10 @@
             PRINT( _L("Camera <= CCamPreCaptureContainerBase::OfferKeyEventL .. capture key up handled") )
             return EKeyWasConsumed;
             }
+        else
+            {
+            UpdateCaptureButton();
+            }
         iController.HandlePendingHdmiEvent();
         }
     else 
@@ -2889,6 +2901,7 @@
         
         buttonActive = ( IsFocused() || iCaptureButtonContainer->IsFocused() ) 
                        && ECamNoOperation == iController.CurrentOperation()
+                       && iController.IsViewFinding()
                        && ( ECamControllerImage == mode || ECamControllerVideo == mode );
 
         PRINT1( _L("Camera <> capture button shown:%d"), buttonActive );