diff -r 85a88bc05e45 -r ffb2d5dd62e9 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserver.cpp Tue Apr 27 16:57:55 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserver.cpp Tue May 11 16:30:11 2010 +0300 @@ -538,6 +538,7 @@ { TN_DEBUG1( "CThumbnailServer::StoreThumbnailL() - file doesn't exists anymore, skip store!"); } + if( iFetchedChecker ) { iFetchedChecker->SetFetchResult( aPath, KErrNone ); @@ -558,6 +559,12 @@ TInt err( iFetchedChecker->LastFetchResult( aPath ) ); if ( err == KErrNone ) // To avoid useless sql gets that fails for sure { + // custom sizes are not stored to db, skip fetching + if ( aThumbnailSize == ECustomThumbnailSize ) + { + User::Leave( KErrNotFound ); + } + TRAP( err, StoreForPathL( aPath )->FetchThumbnailL( aPath, aThumbnail, aData, aThumbnailSize, aOriginalSize) ); if ( err != KErrNone ) { @@ -568,6 +575,12 @@ } else { + // custom sizes are not stored to db, skip fetching + if ( aThumbnailSize == ECustomThumbnailSize ) + { + User::Leave( KErrNotFound ); + } + StoreForPathL( aPath )->FetchThumbnailL( aPath, aThumbnail, aData, aThumbnailSize, aOriginalSize); } } @@ -876,7 +889,6 @@ CThumbnailStore** resPtr = iStores.Find( aDrive ); CThumbnailStore* res = NULL; - if ( resPtr ) { res = * resPtr;