equal
deleted
inserted
replaced
1522 iEarlyMediaOngoing = ETrue; |
1522 iEarlyMediaOngoing = ETrue; |
1523 } |
1523 } |
1524 TBool bothStreamsDisabled ( ETrue ); |
1524 TBool bothStreamsDisabled ( ETrue ); |
1525 TRAP_IGNORE( bothStreamsDisabled = IsBothStreamsDisabledL() ); |
1525 TRAP_IGNORE( bothStreamsDisabled = IsBothStreamsDisabledL() ); |
1526 if ( bothStreamsDisabled && |
1526 if ( bothStreamsDisabled && |
1527 CMceSession::EEstablished == aStream.Session()->State() ) |
1527 CMceSession::EEstablished == aStream.Session()->State() && |
|
1528 IsErrorInULandDLFirstTime() ) |
1528 { |
1529 { |
1529 SetErrorInULandDLFirstTime( EFalse ); |
1530 SetErrorInULandDLFirstTime( EFalse ); |
1530 TRAP_IGNORE( StartTimerL( KSVPICMPErrorTime, KSVPICMPErrorTimerExpired ) ) |
1531 TRAP_IGNORE( StartTimerL( KSVPICMPErrorTime, KSVPICMPErrorTimerExpired ) ) |
1531 } |
1532 } |
1532 else if ( !bothStreamsDisabled && !IsErrorInULandDLFirstTime() ) |
1533 else if ( !bothStreamsDisabled && !IsErrorInULandDLFirstTime() ) |
3101 void CSVPSessionBase::UpdateFailed( CMceSession& aSession, TInt aStatusCode ) |
3102 void CSVPSessionBase::UpdateFailed( CMceSession& aSession, TInt aStatusCode ) |
3102 { |
3103 { |
3103 SVPDEBUG1( "CSVPSessionBase::UpdateFailed In" ) |
3104 SVPDEBUG1( "CSVPSessionBase::UpdateFailed In" ) |
3104 SVPDEBUG2( "CSVPSessionBase::UpdateFailed aStatusCode=%d", aStatusCode ) |
3105 SVPDEBUG2( "CSVPSessionBase::UpdateFailed aStatusCode=%d", aStatusCode ) |
3105 |
3106 |
|
3107 // Check if MCE Session has changed |
|
3108 if ( &Session() != &aSession ) |
|
3109 { |
|
3110 // And if, then update to the current session |
|
3111 SVPDEBUG1( "CSVPSessionBase::UpdateFailed - update MCE Session" ) |
|
3112 delete iSession; |
|
3113 iSession = &aSession; |
|
3114 } |
|
3115 |
3106 if ( iHoldController ) |
3116 if ( iHoldController ) |
3107 { |
3117 { |
3108 iHoldController->RequestFailed( aSession, aStatusCode, *this ); |
3118 iHoldController->RequestFailed( aSession, aStatusCode, *this ); |
3109 } |
3119 } |
3110 |
3120 |