--- a/mmsharing/mmshui/inc/musuiappui.h Wed Sep 01 12:31:01 2010 +0100
+++ b/mmsharing/mmshui/inc/musuiappui.h Tue Sep 14 21:13:00 2010 +0300
@@ -127,6 +127,10 @@
virtual TInt GetUiVolumeValue();
virtual CMusUiResourceHandler* ResourceHandler();
+
+ void SetExitingFlag();
+
+ TBool IsExiting();
private: // from base class CEikAppUi
@@ -198,6 +202,8 @@
CMusUiResourceHandler* iResourceHandler;
+ TBool iExiting;
+
};
--- a/mmsharing/mmshui/inc/musuieventobserver.h Wed Sep 01 12:31:01 2010 +0100
+++ b/mmsharing/mmshui/inc/musuieventobserver.h Tue Sep 14 21:13:00 2010 +0300
@@ -70,6 +70,8 @@
virtual TInt GetUiVolumeValue() = 0;
virtual CMusUiResourceHandler* ResourceHandler() = 0;
+
+ virtual void SetExitingFlag() = 0;
};
#endif // MUSUIEVENTOBSERVER_H
--- a/mmsharing/mmshui/src/musuiappui.cpp Wed Sep 01 12:31:01 2010 +0100
+++ b/mmsharing/mmshui/src/musuiappui.cpp Tue Sep 14 21:13:00 2010 +0300
@@ -509,6 +509,8 @@
RemoveView( KMusUidClipSharingView );
RemoveView( KMusUidReceivingView );
+ iExiting = EFalse;
+
User::Exit( KErrNone );
}
MUS_LOG( "mus: [MUSUI ] <- CMusUiAppUi::HandleExit" );
@@ -774,4 +776,24 @@
}
}
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void CMusUiAppUi::SetExitingFlag()
+ {
+ iExiting = ETrue;
+ }
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TBool CMusUiAppUi::IsExiting ()
+ {
+ return iExiting;
+ }
// end of file
--- a/mmsharing/mmshui/src/musuigeneralview.cpp Wed Sep 01 12:31:01 2010 +0100
+++ b/mmsharing/mmshui/src/musuigeneralview.cpp Tue Sep 14 21:13:00 2010 +0300
@@ -41,7 +41,7 @@
#include <AknIncallBubbleNotify.h>
#include <featmgr.h>
-const TInt KBackgroundIntervalForClose = 10 * 1000 * 1000; // 10s
+const TInt KBackgroundIntervalForClose = 30 * 1000 * 1000; // 30s
const TInt KMusFgBgEventFiltering = 200 * 1000; // 200 ms
// -----------------------------------------------------------------------------
--- a/mmsharing/mmshui/src/musuilivesharingview.cpp Wed Sep 01 12:31:01 2010 +0100
+++ b/mmsharing/mmshui/src/musuilivesharingview.cpp Tue Sep 14 21:13:00 2010 +0300
@@ -130,6 +130,11 @@
CEikMenuPane* aMenuPane )
{
MUS_LOG( "mus: [MUSUI ] -> CMusUiLiveSharingView::DynInitMenuPaneL [%d]" );
+ //if the mus is in exit procedure,we do nothing
+ if ( MusAppUi()->IsExiting() )
+ {
+ return;
+ }
SetZoomVisible(EFalse);
SetBrightnessVisible(EFalse);
// Base class initiated initialization first
--- a/mmsharing/mmshui/src/musuisendcontroller.cpp Wed Sep 01 12:31:01 2010 +0100
+++ b/mmsharing/mmshui/src/musuisendcontroller.cpp Tue Sep 14 21:13:00 2010 +0300
@@ -640,7 +640,7 @@
MUS_LOG( "mus: [MUSUI ] -> CMusUiSendController::ExitProcedureL" );
DismissWaitDialog();
-
+ iEventObserver.SetExitingFlag();
switch ( iShutdownState )
{
case EMusUiShutdownStarted: