# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1264500081 -7200
# Node ID 6dc066157ed496759e00751fe884f6c4a0e1d9a9
# Parent  b1602a5ab0a3c86cff0a24dab4595a13d2b3364f
Revision: 201001
Kit: 201004

diff -r b1602a5ab0a3 -r 6dc066157ed4 vtengines/videoteleng/Logger/Src/CVtLogger.cpp
--- a/vtengines/videoteleng/Logger/Src/CVtLogger.cpp	Mon Jan 18 20:21:33 2010 +0200
+++ b/vtengines/videoteleng/Logger/Src/CVtLogger.cpp	Tue Jan 26 12:01:21 2010 +0200
@@ -292,11 +292,14 @@
     if ( tls )
         {
         CVtLogger* logger = CVtLogger::Logger();
-        TInt count( --(logger->iAccessCount) );
-        if ( !count )
+        if( logger )
             {
-            delete reinterpret_cast<CVtLogger*>( tls );
-            Dll::SetTls( NULL );
+            TInt count( --(logger->iAccessCount) );
+            if ( !count )
+                {
+                delete reinterpret_cast<CVtLogger*>( tls );
+                Dll::SetTls( NULL );
+                }
             }
         }
 
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();
             }
         }