--- a/harvester/client/src/harvesterrequestactive.cpp Mon Jan 18 20:34:07 2010 +0200
+++ b/harvester/client/src/harvesterrequestactive.cpp Tue Jan 26 12:13:20 2010 +0200
@@ -68,7 +68,7 @@
HBufC8* aAlbumIds, TBool& aAddLocation, CHarvesterRequestQueue* aQueue )
: CActive( CActive::EPriorityStandard ), iClient( aClient ), iObserver( aObserver ),
iService( aService ), iUri( aUri ), iAlbumIds( aAlbumIds ), iAddLocation( aAddLocation ),
- iRequestQueue( aQueue ), iLocation( EFalse )
+ iRequestQueue( aQueue ), iLocation( EFalse ), iCancelled( EFalse )
{
CActiveScheduler::Add( this );
}
@@ -115,7 +115,7 @@
//
void CHarvesterRequestActive::DoCancel()
{
- // Nothing to do here
+ iCancelled = ETrue;
}
// ---------------------------------------------------------------------------
@@ -130,8 +130,11 @@
TIpcArgs ipcArgs( &iUri, iAlbumIds, &iLocation );
iPersistentArgs = ipcArgs;
- iClient.HarvestFile( iService, iPersistentArgs, iStatus );
- SetActive();
+ if( !iCancelled )
+ {
+ iClient.HarvestFile( iService, iPersistentArgs, iStatus );
+ SetActive();
+ }
}
// ---------------------------------------------------------------------------