--- a/mmfenh/enhancedmediaclient/Client/src/Components/ClientProgDLSource/ClientProgDLSource.cpp	Thu Jul 15 19:13:36 2010 +0300
+++ b/mmfenh/enhancedmediaclient/Client/src/Components/ClientProgDLSource/ClientProgDLSource.cpp	Thu Aug 19 10:26:11 2010 +0300
@@ -177,6 +177,10 @@
 TInt CClientProgDLSource::MoveFile(const TDesC& aDestFileName )
     {
     TInt status(KErrNone);
+    
+    if (iServerSourceExists)
+        iCustomCommand->CustomCommandSync( iSourceHandle, ESetFileMoving, KNullDesC8, KNullDesC8 );
+
     iDestFileName.Copy(aDestFileName);
     status = iDownloadGateway->MoveFile(iDownloadId,aDestFileName);
     return status;
@@ -414,10 +418,11 @@
             {
     	    des.Copy(iDestFileName);
             }
-	    else
+	    else if (aError == KErrAlreadyExists)
             {
             iDownloadGateway->GetLocalFileName(iDownloadId,des);
             }
+	    iDestFileName.Copy(des);
         TPckgBuf<TFileName> pckg(iDestFileName);
         iCustomCommand->CustomCommandSync( iSourceHandle, ESetUpdateFileName, pckg, KNullDesC8 );
         }