--- a/videoplayback/videoplaybackviews/src/mpxvideopdlplaybackview.cpp	Fri Mar 12 15:43:00 2010 +0200
+++ b/videoplayback/videoplaybackviews/src/mpxvideopdlplaybackview.cpp	Mon Mar 15 12:40:47 2010 +0200
@@ -15,7 +15,8 @@
 *
 */
 
-// Version : %version: 22 %
+
+// Version : %version: 23 %
 
 
 //  Include Files
@@ -116,7 +117,8 @@
 //
 void CMPXVideoPdlPlaybackView::CloseEmbeddedPlaybackViewL()
 {
-    MPX_ENTER_EXIT(_L("CMPXVideoPdlPlaybackView::CloseEmbeddedPlaybackViewL()"));
+    MPX_ENTER_EXIT(_L("CMPXVideoPdlPlaybackView::CloseEmbeddedPlaybackViewL()"),
+                   _L("iPlaybackState = %d"), iPlaybackState );
 
     //
     //  If playback state is playing, pause playback
@@ -128,11 +130,7 @@
     }
     else if ( iPlaybackState == EPbStateStopped )
     {
-        //
-        //  Close the playback plugin and clear out the PDL data from the PDL Handler
-        //
-        HandleCommandL( EMPXPbvCmdClose );
-        AppUi()->HandleCommandL( EAknCmdHideInBackground );
+        ActivateClosePlayerActiveObject();
     }
 
     //
@@ -239,7 +237,7 @@
             //  could not be played until the entire file is downloaded.
             //
             DisplayErrorMessageL( R_MPX_VIDEO_PDL_WAIT_DL_COMPLETE_MSG );
-            ClosePlaybackViewL();
+            ClosePlaybackViewWithErrorL();
 
             break;
         }
@@ -250,7 +248,7 @@
             //  has timed out waiting for more data to be downloaded
             //
             DisplayErrorMessageL( R_MPX_VIDEO_PDL_ALL_CONTENT_PLAYED_MSG );
-            ClosePlaybackViewL();
+            ClosePlaybackViewWithErrorL();
 
             break;
         }
@@ -276,7 +274,7 @@
                 DisplayErrorMessageL( R_MPX_VIDEO_INVALID_CLIP );
             }
 
-            ClosePlaybackViewL();
+            ClosePlaybackViewWithErrorL();
 
             break;
         }
@@ -305,7 +303,7 @@
         case EPbDlStateDownloadCanceled:
         {
             HandleCommandL( EMPXPbvCmdStop );
-            ClosePlaybackViewL();
+            ClosePlaybackViewWithErrorL();
             break;
         }
         case EPbDlStateDownloading:
@@ -422,4 +420,20 @@
     CleanupStack::PopAndDestroy( cmd );
 }
 
+// -------------------------------------------------------------------------------------------------
+//   CMPXVideoPdlPlaybackView::ClosePlaybackViewWithErrorL()
+// -------------------------------------------------------------------------------------------------
+//
+void CMPXVideoPdlPlaybackView::ClosePlaybackViewWithErrorL()
+{
+    MPX_ENTER_EXIT(_L("CMPXVideoPdlPlaybackView::ClosePlaybackViewWithErrorL"));
+
+    //
+    //  An error has been processed, set the playback state to Stopped and close the view
+    //
+    iPlaybackState = EPbStateStopped;
+
+    ClosePlaybackViewL();
+}
+
 // EOF