diff -r 6b5524b4f673 -r 38bb213f60ba phonebookui/Phonebook2/MMCExtension/src/CPmuCopyToDriveCmd.cpp --- a/phonebookui/Phonebook2/MMCExtension/src/CPmuCopyToDriveCmd.cpp Wed Sep 15 11:56:55 2010 +0300 +++ b/phonebookui/Phonebook2/MMCExtension/src/CPmuCopyToDriveCmd.cpp Wed Oct 13 14:15:33 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include // Virtual Phonebook @@ -239,14 +239,15 @@ } else { - // Stop the process dialog when complete the process of copying - iDecorator->ProcessStopped(); + iState = EPmuCopyToMmcCmdComplete; + IssueRequest(); } break; } case EPmuCopyToMmcCmdComplete: { - CommandCompleted(); + // Copy complete, decorator calls processdismissed + iDecorator->ProcessStopped(); break; } default: @@ -326,8 +327,19 @@ // void CPmuCopyToMmcCmd::ProcessDismissed( TInt /*aCancelCode*/ ) { - iState = EPmuCopyToMmcCmdComplete; - IssueRequest(); + Cancel(); + delete iRetrieveOperation; + iRetrieveOperation = NULL; + delete iExportOperation; + iExportOperation = NULL; + + // It is a not big deal if result note is not shown to user + TRAP_IGNORE( ShowResultsL() ); + if ( iUiControl ) + { + iUiControl->UpdateAfterCommandExecution(); + } + iCommandObserver->CommandFinished( *this ); } // -------------------------------------------------------------------------- @@ -641,25 +653,4 @@ return err; } -// -------------------------------------------------------------------------- -// CPmuCopyToMmcCmd::CommandCompleted -// -------------------------------------------------------------------------- -// -void CPmuCopyToMmcCmd::CommandCompleted() - { - Cancel(); - delete iRetrieveOperation; - iRetrieveOperation = NULL; - delete iExportOperation; - iExportOperation = NULL; - - // It is a not big deal if result note is not shown to user - TRAP_IGNORE( ShowResultsL() ); - if ( iUiControl ) - { - iUiControl->UpdateAfterCommandExecution(); - } - iCommandObserver->CommandFinished( *this ); - } - // End of File