--- a/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: 6 %
+// Version : %version: 7 %
 
 #include <sysutil.h>
 #include <s32file.h>
@@ -420,6 +420,8 @@
 {
     MPX_ENTER_EXIT(_L("CMPXVideoPlaybackDisplayHandler::SurfaceCreatedL()"));
 
+    TSurfaceId oldSurfaceId = iSurfaceId;
+    
     //
     //  Extract the surface parameters from the message
     //
@@ -432,7 +434,7 @@
         //
         //  Remove old surface if one exists
         //
-        if ( iSurfaceId.IsNull() )
+        if ( ! oldSurfaceId.IsNull() )
         {
             iVideoDisplay->RemoveSurface();
         }