--- a/omadrm/drmengine/dcfrepository/server/src/DcfRepSrv.cpp	Tue Sep 28 14:08:58 2010 +0300
+++ b/omadrm/drmengine/dcfrepository/server/src/DcfRepSrv.cpp	Thu Oct 14 13:45:23 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -726,7 +726,6 @@
                     {
                     aType = ENoDcf;
                     }
-
                 }
             break;
         case EStateSetTtid:
@@ -1053,6 +1052,11 @@
     TRAPD(r,WriteL(_L8("CompleteScanning")));
 #endif
 
+    if ( iScan->IsActive() )
+        {
+        iScan->Cancel();
+        }
+
     for (TInt i = 0 ; i<iMessageList.Count() ; i++ )
         {
         if ( iMessageList[i] && !(iMessageList[i]->IsNull()) )