diff -r 289bbfdb6627 -r f54ad444594d camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp --- a/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp Thu Jul 15 18:18:07 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp Thu Aug 19 09:36:57 2010 +0300 @@ -981,7 +981,7 @@ // Cancel timer if we're losing focus iZoomTimer->Cancel(); - if ( !iShuttingDown ) + if ( iController.IsAppUiAvailable() && !iShuttingDown ) { iSidePane->MakeVisible( ETrue ); iZoomPane->MakeVisible( EFalse, EFalse ); @@ -2929,7 +2929,8 @@ iDrawIndicator = ETrue; } - if ( iCaptureButtonContainer ) + CCamAppUi* appUi = static_cast( iEikonEnv->AppUi() ); + if ( iCaptureButtonContainer && !( appUi && appUi->SelfTimerEnabled() ) ) { iCaptureButtonContainer->SetCaptureButtonShown( EFalse ); }