--- a/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp Mon Mar 15 12:39:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp Wed Mar 31 21:06:44 2010 +0300
@@ -4027,7 +4027,6 @@
{
SetFlags( iInfo.iState, ECamPowerOn|ECamReserved );
- TRAP_IGNORE( SetFaceTrackingL() );
#if defined( CAMERAAPP_CAE_FOR_VIDEO ) && !defined( CAMERAAPP_CAE_FIX )
// We need to tell to CCaeEngine that the CCamera has been reserved
// and powered on "behind its back".
@@ -4931,9 +4930,17 @@
notify = EFalse;
proceedSequence = ETrue;
PRINT1( _L( "Camera <> CCamCameraController::HandleCallbackEvent - %d reserve try again left" ), iReserveTryAgainCount );
-
}
- else
+ else if(KErrBadName == aStatus &&
+ iSequenceIndex >= 0 &&
+ Request2Event( iSequenceArray[iSequenceIndex] ) == aEventId)
+ {
+ aStatus = KErrNone;
+ notify = ETrue;
+ proceedSequence = ETrue;
+ //EndSequence( aStatus );
+ }
+ else
{
notify = EFalse;