idlehomescreen/xmluirendering/renderingplugins/xnmenufactory/src/xnmenuadapter.cpp
changeset 5 c743ef5928ba
parent 2 08c6ee43b396
child 9 f966699dea19
child 25 31c56aa1478f
--- a/idlehomescreen/xmluirendering/renderingplugins/xnmenufactory/src/xnmenuadapter.cpp	Tue Jan 26 11:48:23 2010 +0200
+++ b/idlehomescreen/xmluirendering/renderingplugins/xnmenufactory/src/xnmenuadapter.cpp	Tue Feb 02 00:04:13 2010 +0200
@@ -1096,7 +1096,7 @@
 //
 void CXnMenuAdapter::SetSoftkeyAppearanceL( CXnSoftkeyItem& aItem )
     {
-    if( IsNodeVisibleL( *aItem.iNode) )
+    if( iContainer && IsNodeVisibleL( *aItem.iNode) )
         {
         if( aItem.iImageOn )
             {
@@ -1104,16 +1104,13 @@
             }
         else if( aItem.iLabel )// change label
             {
-            TBool left( EFalse );
             if ( aItem.iPosition == CEikButtonGroupContainer::ELeftSoftkeyPosition )
                 {
-                left = ETrue;
-                EikSoftkeyImage::SetLabel( iContainer,left );
+                EikSoftkeyImage::SetLabel( iContainer, ETrue );
                 }
             else if ( aItem.iPosition == CEikButtonGroupContainer::ERightSoftkeyPosition )
                 {
-                left = EFalse;
-                EikSoftkeyImage::SetLabel( iContainer,left );
+                EikSoftkeyImage::SetLabel( iContainer, EFalse );
                 }
 
             iContainer->SetCommandL( aItem.iPosition, aItem.iCommandId, *aItem.iLabel );