--- a/mmlibs/mmfw/src/Client/Audio/mmfclienttoneplayer.cpp	Thu Aug 19 11:23:35 2010 +0300
+++ b/mmlibs/mmfw/src/Client/Audio/mmfclienttoneplayer.cpp	Tue Aug 31 16:43:06 2010 +0300
@@ -860,7 +860,7 @@
 
 void CMMFMdaAudioToneUtility::CancelPrepare()
 	{
-	// FIXME - do we need to cancel the callback?  What if the callback is actually calling back another error?  Probably best not to cancel...
+	// xxx - do we need to cancel the callback?  What if the callback is actually calling back another error?  Probably best not to cancel...
 	delete iToneConfig;
 	iToneConfig = NULL;
 
@@ -1037,10 +1037,7 @@
 		}
 	else
 		{
-        if(iPlayStartObserver)
-            {
-            iAsyncCallback->MatoPlayStarted(KErrNone);
-            }
+		iAsyncCallback->MatoPlayStarted(KErrNone);
 		}
 	}
 	
@@ -1142,15 +1139,12 @@
 
 void CMMFMdaAudioToneObserverCallback::MatoPlayComplete(TInt aError)
 	{
-    if(!IsActive())
-        {
-        iAction = EPlayComplete;
-        iErrorCode = aError;
-        
-        TRequestStatus* s = &iStatus;
-        SetActive();
-        User::RequestComplete(s, KErrNone);
-        }
+	iAction = EPlayComplete;
+	iErrorCode = aError;
+
+	TRequestStatus* s = &iStatus;
+	SetActive();
+	User::RequestComplete(s, KErrNone);
 	}
 
 void CMMFMdaAudioToneObserverCallback::MatoPlayStarted(TInt aError)