diff -r c58fd5f0c240 -r 594d59766373 cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp --- a/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp Thu Jul 15 19:16:18 2010 +0300 +++ b/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp Thu Aug 19 10:28:14 2010 +0300 @@ -53,11 +53,18 @@ TKeyResponse CPsuiQueryDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType ) { - if ( ( aKeyEvent.iScanCode == EStdKeyNo || aKeyEvent.iCode == EKeyNo ) && - aType == EEventKeyUp ) + const TBool noKeyReleased = + ( aKeyEvent.iScanCode == EStdKeyNo || aKeyEvent.iCode == EKeyNo ) && + aType == EEventKeyUp; + const TBool escPressed = aKeyEvent.iCode == EKeyEscape; + + // AknDialogShutter sends esc keys so dismiss dialog + if ( noKeyReleased || escPressed ) { // End -key was pressed, so exit this query dialog - TryExitL( EKeyNo ); + TryExitL( EKeyNo ); + RDebug::Printf("PSETNOTESUI: exiting dialog"); + return EKeyWasConsumed; } return EKeyWasNotConsumed;