--- a/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp	Tue May 25 12:22:04 2010 +0300
+++ b/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp	Wed Jun 09 09:21:41 2010 +0300
@@ -649,6 +649,10 @@
         HandleFlashStatusEvent( aEvent.iErrorCode, ECamCameraEventFlashNotReady );
         break;
       // -------------------------------
+      // Capture event
+      case KUidECamEventImageCaptureEventUidValue:
+          NotifyObservers(aEvent.iErrorCode,  ECamCameraEventImageCaptureEvent, EventClass( ECamCameraEventImageCaptureEvent ));
+      break;
       default:
         break;
       // -------------------------------
@@ -4140,6 +4144,8 @@
 CCamCameraController::HandleReserveGainEvent( TInt aStatus )
   {
   PRINT1( _L("Camera => CCamCameraController::HandleReserveGainEvent, status:%d"), aStatus );
+  iAfInProgress = EFalse;  // Stop waiting autofocus events, if reserving camera.
+
   CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() );
   if( appUi->StandbyStatus() && !appUi->IsRecoverableStatus() )
       {
@@ -5705,6 +5711,7 @@
     case ECamCameraEventImageStop:
     case ECamCameraEventImageRelease:
     case ECamCameraEventImageData:
+    case ECamCameraEventImageCaptureEvent:
       return ECamCameraEventClassImage;
     // -------------------------------------------------------
     case ECamCameraEventVideoInit: