equal
deleted
inserted
replaced
722 if ( ( aError == KErrNone ) && |
722 if ( ( aError == KErrNone ) && |
723 !( iChooseIapPref.NoteBehaviour() & |
723 !( iChooseIapPref.NoteBehaviour() & |
724 TExtendedConnPref::ENoteBehaviourConnDisableNotes ) ) |
724 TExtendedConnPref::ENoteBehaviourConnDisableNotes ) ) |
725 { |
725 { |
726 TBool connectionAlreadyActive = |
726 TBool connectionAlreadyActive = |
727 iSession->MyServer().CheckIfStarted( aPolicyPref->IapId() ); |
727 iSession->MyServer().CheckIfStarted( aPolicyPref->IapId(), |
|
728 iSession->ConnectionId() ); |
728 CConnectionUiUtilities* connUiUtils = NULL; |
729 CConnectionUiUtilities* connUiUtils = NULL; |
729 if ( !connectionAlreadyActive ) |
730 if ( !connectionAlreadyActive && |
|
731 ( iSession->IsMMSIap( aPolicyPref->IapId() ) == EFalse ) ) |
730 { |
732 { |
731 TRAPD( popupError, |
733 TRAPD( popupError, |
732 connUiUtils = CConnectionUiUtilities::NewL(); |
734 connUiUtils = CConnectionUiUtilities::NewL(); |
733 connUiUtils->ConnectingViaDiscreetPopup( |
735 connUiUtils->ConnectingViaDiscreetPopup( |
734 aPolicyPref->IapId()); |
736 aPolicyPref->IapId()); |
875 // We are done |
877 // We are done |
876 // |
878 // |
877 delete iDialog; |
879 delete iDialog; |
878 iDialog = NULL; |
880 iDialog = NULL; |
879 |
881 |
880 ImplicitConnectionL(); |
882 // Dialog is deleted. Letting a function leave here would panic the whole MPM. |
|
883 // |
|
884 TRAPD( err, ImplicitConnectionL() ); |
|
885 if( err != KErrNone ) |
|
886 { |
|
887 ChooseIapComplete( err, &iChooseIapPref ); |
|
888 } |
881 } |
889 } |
882 |
890 |
883 // ----------------------------------------------------------------------------- |
891 // ----------------------------------------------------------------------------- |
884 // CMPMIapSelection::ImplicitConnectionWlanNoteL |
892 // CMPMIapSelection::ImplicitConnectionWlanNoteL |
885 // ----------------------------------------------------------------------------- |
893 // ----------------------------------------------------------------------------- |