--- a/phoneapp/phoneuicontrol/src/cphonebtaadisconnecthandler.cpp Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonebtaadisconnecthandler.cpp Tue Aug 31 15:14:29 2010 +0300
@@ -97,12 +97,11 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneBtaaDisconnectHandler::Cancel()");
TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery ) );
- if ( !iOldMuted && iStateMachine->PhoneEngineInfo()->AudioMute() &&
- ELaunchQuery == iState )
+ DeleteAll();
+ if ( !iOldMuted && iStateMachine->PhoneEngineInfo()->AudioMute() )
{
TRAP_IGNORE ( SetMuteL( EFalse ) );
}
- DeleteAll();
iOldMuted = EFalse;
}
@@ -284,7 +283,7 @@
void CPhoneBtaaDisconnectHandler::ShowQueryL( TInt aResourceId )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneBtaaDisconnectHandler::ShowQueryL( ) ");
- //__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
+ //__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
TPhoneCmdParamQuery queryParam;
queryParam.SetQueryType( EPhoneGlobalQueryDialog );