diff -r b1602a5ab0a3 -r 6dc066157ed4 vtuis/videotelui/src/CVtUiAppUi.cpp --- a/vtuis/videotelui/src/CVtUiAppUi.cpp Mon Jan 18 20:21:33 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiAppUi.cpp Tue Jan 26 12:01:21 2010 +0200 @@ -2580,12 +2580,12 @@ CVtUiColorTone* ct = static_cast< CVtUiColorTone* >( iFeatureManager->GetFeatureById( EVtUiFeatureIdColourTone ) ); - if ( wb->State() == MVtUiFeature::EActive ) + if ( wb && wb->State() == MVtUiFeature::EActive ) { __VTPRINT( DEBUG_GEN, "CVtUiWhiteBalance::DoDeactivateL" ); wb->DoDeactivateL (); } - if ( ct->State() == MVtUiFeature::EActive ) + if ( ct && ct->State() == MVtUiFeature::EActive ) { __VTPRINT( DEBUG_GEN, "CVtUiColorTone::DoDeactivateL" ); ct->DoDeactivateL( ); @@ -4818,9 +4818,9 @@ } if( currentCamId == MVtEngMedia::ESecondaryCamera ) { - if( wb->IsPendingCmd() ) + if( wb && wb->IsPendingCmd() ) wb->HandlePendingCmdL(); - if( ct->IsPendingCmd() ) + if( ct && ct->IsPendingCmd() ) ct->HandlePendingCmdL(); } }