diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -513,11 +513,10 @@ VPbkFieldTypeSelectorFactory::TVPbkContactActionTypeSelector contactActionType = iPlugin.Container().SelectedCommunicationMethod(); - - if ( !iLongTap && contactActionType + + if ( contactActionType == VPbkFieldTypeSelectorFactory::EFindOnMapSelector ) - { - iLongTap = ETrue; + { DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap ); } else @@ -608,14 +607,7 @@ // void CCCAppCommLauncherContainer::HandleFindOnMapContactActionL() { - if ( !iLongTap ) - { - DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap ); - } - else - { - iLongTap = EFalse; - } + DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap ); } // ---------------------------------------------------------------------------- @@ -812,6 +804,13 @@ void CCCAppCommLauncherContainer::ContactInfoFetchedNotifyL( const CCmsContactFieldInfo& aContactFieldInfo) { + + //CloseAll Pending Pbk2Commands initiated by CCA. + if( iPbkCmd ) + { + iPbkCmd->DeleteAllRunningCmd(); + } + // update buttons iModel->UpdateAddressesValidationL( aContactFieldInfo ); iModel->FillButtonArrayL();