Revision: 201001 PDK_3.0.f
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 26 Jan 2010 12:18:42 +0200
changeset 3 b425f12f328d
parent 2 7a9a8e73f54b
child 4 d45095c2f4f3
Revision: 201001 Kit: 201004
mpx/collectionframework/collectionengine/src/mpxcollectioncache.cpp
mpx/playbackframework/playbackengine/src/mpxplaybackengine.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 );
--- 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