diff -r bf64cebf4673 -r 53c8aa5d97a3 camerauis/cameraapp/generic/src/CamBurstCaptureArray.cpp --- a/camerauis/cameraapp/generic/src/CamBurstCaptureArray.cpp Tue May 11 15:56:11 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamBurstCaptureArray.cpp Tue May 25 12:22:04 2010 +0300 @@ -133,10 +133,7 @@ { return KNullDesC; } - else - { - return *iFileName; - } + return *iFileName; } // --------------------------------------------------------------------------- @@ -146,6 +143,10 @@ // const TDesC& CCamBurstCaptureArray::CCamBurstCaptureItem::ImageName() const { + if( !iImageName ) + { + return KNullDesC; + } return *iImageName; }