equal
deleted
inserted
replaced
2578 CVtUiWhiteBalance* wb = static_cast< CVtUiWhiteBalance* >( |
2578 CVtUiWhiteBalance* wb = static_cast< CVtUiWhiteBalance* >( |
2579 iFeatureManager->GetFeatureById( EVtUiFeatureIdWhiteBalance ) ); |
2579 iFeatureManager->GetFeatureById( EVtUiFeatureIdWhiteBalance ) ); |
2580 CVtUiColorTone* ct = static_cast< CVtUiColorTone* >( |
2580 CVtUiColorTone* ct = static_cast< CVtUiColorTone* >( |
2581 iFeatureManager->GetFeatureById( EVtUiFeatureIdColourTone ) ); |
2581 iFeatureManager->GetFeatureById( EVtUiFeatureIdColourTone ) ); |
2582 |
2582 |
2583 if ( wb->State() == MVtUiFeature::EActive ) |
2583 if ( wb && wb->State() == MVtUiFeature::EActive ) |
2584 { |
2584 { |
2585 __VTPRINT( DEBUG_GEN, "CVtUiWhiteBalance::DoDeactivateL" ); |
2585 __VTPRINT( DEBUG_GEN, "CVtUiWhiteBalance::DoDeactivateL" ); |
2586 wb->DoDeactivateL (); |
2586 wb->DoDeactivateL (); |
2587 } |
2587 } |
2588 if ( ct->State() == MVtUiFeature::EActive ) |
2588 if ( ct && ct->State() == MVtUiFeature::EActive ) |
2589 { |
2589 { |
2590 __VTPRINT( DEBUG_GEN, "CVtUiColorTone::DoDeactivateL" ); |
2590 __VTPRINT( DEBUG_GEN, "CVtUiColorTone::DoDeactivateL" ); |
2591 ct->DoDeactivateL( ); |
2591 ct->DoDeactivateL( ); |
2592 } |
2592 } |
2593 |
2593 |
4816 |
4816 |
4817 return; |
4817 return; |
4818 } |
4818 } |
4819 if( currentCamId == MVtEngMedia::ESecondaryCamera ) |
4819 if( currentCamId == MVtEngMedia::ESecondaryCamera ) |
4820 { |
4820 { |
4821 if( wb->IsPendingCmd() ) |
4821 if( wb && wb->IsPendingCmd() ) |
4822 wb->HandlePendingCmdL(); |
4822 wb->HandlePendingCmdL(); |
4823 if( ct->IsPendingCmd() ) |
4823 if( ct && ct->IsPendingCmd() ) |
4824 ct->HandlePendingCmdL(); |
4824 ct->HandlePendingCmdL(); |
4825 } |
4825 } |
4826 } |
4826 } |
4827 } |
4827 } |
4828 // ----------------------------------------------------------------------------- |
4828 // ----------------------------------------------------------------------------- |