diff -r 3738fe97f027 -r 8aed59de29f9 videoplayback/hbvideoplaybackviewplugin/src/mpxhbvideoplaybackviewplugin.cpp --- a/videoplayback/hbvideoplaybackviewplugin/src/mpxhbvideoplaybackviewplugin.cpp Thu Apr 01 23:32:44 2010 +0300 +++ b/videoplayback/hbvideoplaybackviewplugin/src/mpxhbvideoplaybackviewplugin.cpp Fri Apr 16 18:13:14 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: 6 % +// Version : %version: 7 % @@ -58,9 +58,12 @@ void QMpxHbVideoPlaybackViewPlugin::createView() { MPX_ENTER_EXIT(_L("QMpxHbVideoPlaybackViewPlugin::createView()")); - - mView = new HbVideoPlaybackView(); - connect( mView, SIGNAL( activatePreviousView() ), this, SLOT( back() ) ); + + if ( ! mView ) + { + mView = new HbVideoPlaybackView(); + connect( mView, SIGNAL( activatePreviousView() ), this, SLOT( back() ) ); + } } // --------------------------------------------------------------------------- @@ -73,6 +76,8 @@ if ( mView ) { + disconnect( mView, SIGNAL( activatePreviousView() ), this, SLOT( back() ) ); + delete mView; mView = NULL; } @@ -101,8 +106,11 @@ { MPX_ENTER_EXIT(_L("QMpxHbVideoPlaybackViewPlugin::deactivateView()")); - mView->handleDeactivateView(); - mViewActivated = false; + if ( mView && mViewActivated ) + { + mView->handleDeactivateView(); + mViewActivated = false; + } } // ---------------------------------------------------------------------------