diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -217,7 +217,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneTwoSinglesAndWaiting::HandleIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); if ( !IsNumberEntryUsedL() ) { iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); @@ -232,7 +232,7 @@ { StateTransitionToSingleAndWaitingL(); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -309,7 +309,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneTwoSinglesAndWaiting::HandleConnectedConferenceL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update call state TPhoneCmdParamCallHeaderData callHeaderParam; @@ -343,11 +343,17 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewCreateConference, aCallId, &callHeaderParam ); - SetNeedToReturnToForegroundAppStatusL( EFalse ); + // Clear the flag + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( EFalse ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); + // Go to Conference And Waiting state // No need for CBA update - iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting ); + iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting ); } // -----------------------------------------------------------