uifw/AvKon/src/akndialog.cpp
branchRCL_3
changeset 20 d48ab3b357f1
parent 19 aecbbf00d063
--- a/uifw/AvKon/src/akndialog.cpp	Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/AvKon/src/akndialog.cpp	Wed Sep 01 12:16:19 2010 +0100
@@ -87,7 +87,7 @@
  */
 EXPORT_C CAknDialog::~CAknDialog() 
 	{
-    AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( NULL );
+    AknItemActionMenuRegister::RemoveConstructingMenuBarOwner( this );
 
     if ( iCoeEnv->AppUi() && iAttributes )
 		if (iAttributes->iAknDialogFlags&EAknDialogFlagDefaultSounds) // return original sound stack
@@ -243,7 +243,10 @@
  */
 EXPORT_C void CAknDialog::DisplayMenuL() 
 	{
-	iMenuBar->TryDisplayMenuBarL();
+    if (iMenuBar)
+        {
+        iMenuBar->TryDisplayMenuBarL();
+        }
 	}
 
 /**