diff -r beaa16f65879 -r 2a40e88564c8 mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewimp.cpp --- a/mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewimp.cpp Tue Jan 26 11:56:33 2010 +0200 +++ b/mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewimp.cpp Tue Feb 02 00:09:33 2010 +0200 @@ -3375,8 +3375,8 @@ playlist = source->PlaylistL(); if ( playlist ) { - iPlaybackUtility->CommandL(EPbCmdPreserveState); CleanupStack::PushL( playlist ); + iPlaybackUtility->CommandL(EPbCmdPreserveState); } } @@ -3867,6 +3867,7 @@ CMPXCollectionPlaylist* playlist = s->PlaylistL(); if ( playlist ) { + CleanupStack::PushL( playlist ); if ( playlist->Count() > 0 ) { TMPXPlaybackState state = iPlaybackUtility->StateL(); @@ -3880,7 +3881,7 @@ iCommonUiHelper->SetMiddleSoftKeyLabelL( *cba, R_QTN_MSK_PLAY, EAknSoftkeyForwardKeyEvent); } } - delete playlist; + CleanupStack::PopAndDestroy( playlist ); } } MPX_DEBUG1("CMPXCommonPlaybackViewImp::UpdateMiddleSoftKeyDisplayL - new label displayed"); @@ -3916,6 +3917,7 @@ CMPXCollectionPlaylist* playlist = s->PlaylistL(); if ( playlist ) { + CleanupStack::PushL( playlist ); if ( playlist->Count() > 0 ) { if( pausePlayControl ) @@ -3940,7 +3942,7 @@ } } - delete playlist; + CleanupStack::PopAndDestroy( playlist ); } else {