diff -r 53c8aa5d97a3 -r 8f559c47d7fd camerauis/cameraapp/generic/src/CamBurstThumbnailContainer.cpp --- a/camerauis/cameraapp/generic/src/CamBurstThumbnailContainer.cpp Tue May 25 12:22:04 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamBurstThumbnailContainer.cpp Wed Jun 09 09:21:41 2010 +0300 @@ -170,7 +170,7 @@ // TInt CCamBurstThumbnailContainer::CountComponentControls() const { - return 1; // Return the number of controls inside this container + return CCamContainerBase::CountComponentControls() + 1; // Return the number of controls inside this container } // --------------------------------------------------------- @@ -180,18 +180,22 @@ // CCoeControl* CCamBurstThumbnailContainer::ComponentControl( TInt aIndex ) const { + CCoeControl* control = NULL; + control = CCamContainerBase::ComponentControl( aIndex ); + if( control != NULL ) + return control; switch ( aIndex ) { - case 0: + case 1: { - return iGridControl; - } + control = iGridControl; + } + break; default: break; } - // Should never get here - return NULL; + return control; }