diff -r 156f692b1687 -r b99b84bcd2d1 tstaskmonitor/utils/src/tsfswentry.cpp --- a/tstaskmonitor/utils/src/tsfswentry.cpp Fri Jun 11 13:58:37 2010 +0300 +++ b/tstaskmonitor/utils/src/tsfswentry.cpp Wed Jun 23 18:33:40 2010 +0300 @@ -319,43 +319,45 @@ // CTsFswEntry::SetScreenshot // -------------------------------------------------------------------------- // -TBool CTsFswEntry::SetScreenshotL(const CFbsBitmap* bitmapArg, UpdatePriority priority) +void CTsFswEntry::SetScreenshotL(const CFbsBitmap* bitmapArg, UpdatePriority priority) { TInt currentPriority = static_cast (mPriority); TInt newPriority = static_cast (priority); - if (newPriority >= currentPriority) { - CFbsBitmap* bitmap = new (ELeave) CFbsBitmap; - CleanupStack::PushL(bitmap); - User::LeaveIfError(bitmap->Duplicate(bitmapArg->Handle())); - CleanupStack::Pop(bitmap); + if(newPriority Duplicate(bitmapArg->Handle())); + CleanupStack::Pop(bitmap); - mPriority = priority; - delete mScreenshot; - mScreenshot = bitmap; + mPriority = priority; + delete mScreenshot; + mScreenshot = bitmap; - delete mImgTool; - mImgTool = 0; + delete mImgTool; + mImgTool = 0; - mImgTool = CTsGraphicFileScalingHandler::NewL(*this, *mScreenshot, TSize(128, 128), - CTsGraphicFileScalingHandler::EKeepAspectRatioByExpanding); - return ETrue; - } - return EFalse; + mImgTool = CTsGraphicFileScalingHandler::NewL(*this, *mScreenshot, TSize(128, 128), + CTsGraphicFileScalingHandler::EKeepAspectRatioByExpanding); } // -------------------------------------------------------------------------- // CTsFswEntry::RemoveScreenshot // -------------------------------------------------------------------------- // -TBool CTsFswEntry::RemoveScreenshot() +void CTsFswEntry::RemoveScreenshotL() { - if (mScreenshot) { - delete mScreenshot; - mScreenshot = NULL; - mPriority = Low; - return ETrue; + if (!mScreenshot) { + User::Leave(KErrNotFound); } - return EFalse; + delete mScreenshot; + mScreenshot = NULL; + mPriority = Low; + if (mObserver) { + mObserver->DataChanged(); + } } // --------------------------------------------------------------------------