uifw/AvKon/src/aknview.cpp
changeset 14 3320e4e6e8bb
parent 0 2f259fa3e83a
--- a/uifw/AvKon/src/aknview.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/AvKon/src/aknview.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -576,22 +576,16 @@
 EXPORT_C void CAknView::AknViewActivatedL( const TVwsViewId& aPrevViewId, TUid aCustomMessageId, const TDesC8& aCustomMessage )
 	{
 	ConstructMenuAndCbaL( ETrue );
-
-    if ( !iViewInfo.iMenu )
-        {
-        AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( this );
-        }
-    
-	Extension()->PrepareToolbar();
-
-	DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage );
-
-    if ( !Extension()->iViewActivated || !iViewInfo.iMenu )
+    if ( !Extension()->iViewActivated )
         {
         // Reset menu bar owner when view first activated
         AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( NULL );
         Extension()->iViewActivated = ETrue;
         }
+	
+	Extension()->PrepareToolbar();
+
+	DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage );
 
 #ifdef RD_SCALABLE_UI_V2
     if ( iAvkonAppUi->TouchPane() )