--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailtask.cpp Tue May 11 16:30:11 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailtask.cpp Tue May 25 13:01:47 2010 +0300
@@ -113,9 +113,9 @@
{
iState = EComplete;
- if ( iMessage.Handle())
+ if ( ClientThreadAlive() )
{
- if(iMessage.Identity() == KDaemonUid )
+ if( iMessage.Identity() == KDaemonUid )
{
iProcessor.SetDaemonAsProcess(ETrue);
}
@@ -123,10 +123,12 @@
{
iProcessor.SetDaemonAsProcess(EFalse);
}
+
iMessage.Complete( CThumbnailServerSession::ConvertSqlErrToE32Err( aReason ));
- ResetMessageData();
}
+ ResetMessageData();
+
iProcessor.TaskComplete( this );
}
}
@@ -230,15 +232,12 @@
//
void CThumbnailTask::CancelMessage()
{
- if ( iMessage.Handle())
+ if ( ClientThreadAlive() )
{
- if ( ClientThreadAlive() )
- {
- iMessage.Complete( KErrCancel );
- }
-
- ResetMessageData();
+ iMessage.Complete( KErrCancel );
}
+
+ ResetMessageData();
}
// ---------------------------------------------------------------------------