# HG changeset patch
# User hgs
# Date 1286971178 -3600
# Node ID faaab429cc2bdbaad2df16d02d1c1145c2048863
# Parent  5c1df44f2eed043e42a7879f28e580703384ca4a
2010wk42_02

diff -r 5c1df44f2eed -r faaab429cc2b mmaudio_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf
diff -r 5c1df44f2eed -r faaab429cc2b mmaudio_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf
diff -r 5c1df44f2eed -r faaab429cc2b mmlibs/mmfw/SecureDRM/src/Client/MmfDrmPluginServerProxy.cpp
--- a/mmlibs/mmfw/SecureDRM/src/Client/MmfDrmPluginServerProxy.cpp	Wed Oct 13 12:45:32 2010 +0100
+++ b/mmlibs/mmfw/SecureDRM/src/Client/MmfDrmPluginServerProxy.cpp	Wed Oct 13 12:59:38 2010 +0100
@@ -38,7 +38,7 @@
 	TInt err = CreateSession(KDrmPluginServerName, TVersion(KMMFDRMPluginServerVersion,
 														KMMFDRMPluginServerMinorVersionNumber,
 														KMMFDRMPluginServerBuildVersionNumber));
-	if(err == KErrNotFound)
+	if(err == KErrNotFound || err == KErrServerTerminated)
 		{
 		// Server not running
 		// Construct the server binary name
@@ -46,7 +46,7 @@
 		RProcess server;
 
 		err = server.Create(KDrmPluginServerFileName, KNullDesC, serverUid);
-		if(err != KErrNone)
+		if(err != KErrNone && err != KErrAlreadyExists)
 			return err;
 		// Synchronise with the server
 		TRequestStatus reqStatus;