diff -r 7d91903f795f -r ce5ada96ab30 videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp --- a/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp Fri Feb 19 22:52:52 2010 +0200 +++ b/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp Fri Mar 12 15:43:00 2010 +0200 @@ -15,7 +15,7 @@ * */ -// Version : %version: 61 % +// Version : %version: 63 % // Include Files @@ -64,6 +64,7 @@ #include #include "mpxmediavideodefs.h" #include "mpxvideo_debug.h" +#include "mpxvideoplayercustomviewmsgconsts.h" // Member Functions @@ -220,6 +221,7 @@ CreateGeneralPlaybackCommandL( EPbCmdPause ); break; } + case EAknSoftkeyClose: case EMPXPbvCmdClose: { MPX_DEBUG(_L("CMPXVideoBasePlaybackView::HandleCommandL() EMPXPbvCmdClose")); @@ -363,17 +365,9 @@ LaunchDRMDetailsL(); break; } - case EAknSoftkeyClose: + case KMpxVideoPlaybackPdlReloading: { - // - // Close is in progress - // Remove the display window so the surface can be released - // - if ( iDisplayHandler ) - { - iDisplayHandler->RemoveDisplayWindow(); - } - + iPdlReloading = ETrue; break; } }