--- a/videoplayerapp/videoplayerengine/src/videoplayerengine.cpp	Thu Jul 08 13:05:19 2010 +0300
+++ b/videoplayerapp/videoplayerengine/src/videoplayerengine.cpp	Fri Jul 23 11:10:06 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: da1mmcf#38 %
+// Version : %version: 40 %
 
 
 #include <QApplication>
@@ -162,7 +162,14 @@
             createPlaybackView(); 
             viewType = MpxHbVideoCommon::MpxHbVideoViewType(typeGotten);
             QVariant data = VideoActivityState::instance().getActivityData( KEY_LAST_PLAYED_CLIP );
-            playMedia( data.toString() );
+            int error = mPlaybackWrapper->replayMedia( data.toString() );
+            
+            // if replay fails, then activate collection view instead
+            if ( error != KErrNone )
+            {
+                loadPluginAndCreateView( MpxHbVideoCommon::CollectionView );  
+                activateView( MpxHbVideoCommon::CollectionView );                 
+            }            
         }
         else
         {
@@ -225,6 +232,20 @@
 }
 
 // -------------------------------------------------------------------------------------------------
+// viewReadySlot()
+// -------------------------------------------------------------------------------------------------
+//
+void VideoPlayerEngine::viewReadySlot()
+{
+    MPX_ENTER_EXIT(_L("VideoPlayerEngine::viewReady()"));
+    emit applicationReady();
+    // since we need to emit applicationReady only once at startup,
+    // disconnect the viewReady -signal from this object
+    disconnect(hbInstance->allMainWindows().value(0), SIGNAL(viewReady()), 
+               this, SLOT(viewReadySlot()));
+}
+
+// -------------------------------------------------------------------------------------------------
 // doDelayedLoad()
 // -------------------------------------------------------------------------------------------------
 //