--- a/vtuis/videotelui/src/CVtUiAppUi.cpp	Wed Apr 14 16:00:08 2010 +0300
+++ b/vtuis/videotelui/src/CVtUiAppUi.cpp	Tue Apr 27 16:40:55 2010 +0300
@@ -1840,18 +1840,6 @@
     
     TInt pos = 
         iInstance->iRemoteVideoControl->DrawableWindow()->OrdinalPosition();
-    if ( aMode == ERenderingModeDialer )
-        {
-        // Remote video control has the highest priority in dialer
-        iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( 
-                pos, KVtUiRemoteVideoControlOrdinalPriHigh );
-        }
-    else 
-        {
-        // Set remote video control priority back to normal
-        iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( 
-                pos, KVtUiRemoteVideoControlOrdinalPriNormal );
-        }
     
     if ( aNewDownlink )
         {
@@ -1866,6 +1854,20 @@
         }
     RefreshBlind();
     UpdateRenderingParametersL();
+    
+    if ( aMode == ERenderingModeDialer )
+        {
+        // Remote video control has the highest priority in dialer
+        iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( 
+                pos, KVtUiRemoteVideoControlOrdinalPriHigh );
+        }
+    else 
+        {
+        // Set remote video control priority back to normal
+        iInstance->iRemoteVideoControl->DrawableWindow()->SetOrdinalPosition( 
+                pos, KVtUiRemoteVideoControlOrdinalPriNormal );
+        }
+    
     __VTPRINTEXIT( "VtUi.SetRenderingModeL" )
     }
 
@@ -2280,6 +2282,7 @@
             break;
 
         case EVtUiCmdSwapImagesPlaces:
+            {
             refresh = ETrue;
             CleanupPushEnableBlindL();
             iUiStates->SetDisableBlindSetting( ETrue );
@@ -2293,6 +2296,7 @@
                 }
                 
             CleanupStack::PopAndDestroy(); // CleanupPushEnableBlindL
+            }
             break;
 
         case EVtUiCmdZoom:
@@ -2671,12 +2675,12 @@
     if ( wb && wb->State() == MVtUiFeature::EActive )
         {
         __VTPRINT( DEBUG_GEN, "CVtUiWhiteBalance::DoDeactivateL" );
-        wb->DoDeactivateL ();
+        wb->Stop();
         }
     if ( ct && ct->State() == MVtUiFeature::EActive )
         {
         __VTPRINT( DEBUG_GEN, "CVtUiColorTone::DoDeactivateL" );
-        ct->DoDeactivateL( );            
+        ct->Stop( );            
         }
     
     // close volume slider
@@ -2887,13 +2891,16 @@
         {
         ExecuteCmdL( KVtEngUnfreeze );
         }
-    if ( !IsViewFinderInMainPane() )
-        {
-        SwitchViewFinderToMainPaneL( !isFrozen );
-        }
-    else if ( !isFrozen )
-        {
-        iUiStates->SetViewFindersInitialPlaceContextPane( EFalse );
+    if ( iUiStates->IsCaptureModeOn() )
+        {
+        if ( !IsViewFinderInMainPane() )
+            {
+            SwitchViewFinderToMainPaneL( !isFrozen );
+            }
+        else if ( !isFrozen )
+            {
+            iUiStates->SetViewFindersInitialPlaceContextPane( EFalse );
+            }
         }
     
     RefreshStatesL();