# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1264501122 -7200 # Node ID b425f12f328dbec3fe50ca9951af36d27c94d370 # Parent 7a9a8e73f54b16bd72ab7b119fdb5a4db39a97f6 Revision: 201001 Kit: 201004 diff -r 7a9a8e73f54b -r b425f12f328d mpx/collectionframework/collectionengine/src/mpxcollectioncache.cpp --- a/mpx/collectionframework/collectionengine/src/mpxcollectioncache.cpp Mon Jan 18 20:36:37 2010 +0200 +++ b/mpx/collectionframework/collectionengine/src/mpxcollectioncache.cpp Tue Jan 26 12:18:42 2010 +0200 @@ -809,7 +809,10 @@ CleanupStack::PushL( buffer ); TPtr8 ptr8 = buffer->Ptr(0); TPtrC ptr = MPXUser::Ptr( ptr8 ); - iResults->SetTextValueL( KMPXCollectionOpenLAllResultRange, ptr ); + if(iResults) + { + iResults->SetTextValueL( KMPXCollectionOpenLAllResultRange, ptr ); + } CleanupStack::PopAndDestroy( buffer ); CleanupStack::PopAndDestroy( &datablocks ); diff -r 7a9a8e73f54b -r b425f12f328d mpx/playbackframework/playbackengine/src/mpxplaybackengine.cpp --- a/mpx/playbackframework/playbackengine/src/mpxplaybackengine.cpp Mon Jan 18 20:36:37 2010 +0200 +++ b/mpx/playbackframework/playbackengine/src/mpxplaybackengine.cpp Tue Jan 26 12:18:42 2010 +0200 @@ -2504,12 +2504,6 @@ MediaFromCollectionL(); break; } - else if ( EPlayFromUri == iPlaySource && - EPbStateStopped == oldNextState ) - { - TRAP_IGNORE( InitL( iUri, &( KNullDesC8 ), NULL, iAccessPoint ) ); - break; - } else { // fall through on purpose