diff -r 83ca720e2b9a -r bb1f80fb7db2 bearermanagement/mpm/src/mpmwlanquerydialog.cpp --- a/bearermanagement/mpm/src/mpmwlanquerydialog.cpp Wed Sep 01 12:23:51 2010 +0100 +++ b/bearermanagement/mpm/src/mpmwlanquerydialog.cpp Tue Sep 14 22:06:05 2010 +0300 @@ -207,6 +207,7 @@ { iIapSelection.Session()->MyServer().SetOfflineWlanQueryResponse( EOfflineResponseNo ); + iIapSelection.Session()->MyServer().StartOfflineQueryTimer(); MPMLOGSTRING2( "CMPMWlanQueryDialog::RunL offline query returned %d", iStatus.Int() ) } @@ -474,14 +475,22 @@ iIapSelection.UserWlanSelectionDoneL( KErrPermissionDenied, iWlanIapId ); } else - { - MPMLOGSTRING( "CMPMWlanQueryDialog::StartWlanQuery, starting offline note" ) + { iWlanQueryState = EOffline; - iNotifier.StartNotifierAndGetResponse( iStatus, - KUidCOfflineWlanNoteDlg, - KNullDesC8(), - iOfflineReply ); - SetActive(); + if ( !iIapSelection.Session()->MyServer().IsOfflineQueryTimerOn() ) + { + MPMLOGSTRING( "CMPMWlanQueryDialog::StartWlanQuery, starting offline query" ) + iNotifier.StartNotifierAndGetResponse( iStatus, + KUidCOfflineWlanNoteDlg, + KNullDesC8(), + iOfflineReply ); + SetActive(); + } + else + { + MPMLOGSTRING( "CMPMWlanQueryDialog::StartWlanQuery, offline note not shown as OfflineQueryTimer is active" ) + iIapSelection.UserWlanSelectionDoneL( KErrPermissionDenied, iWlanIapId ); + } } } // if easy wlan iap and some wlan iap started, use existing connection