diff -r 6b5524b4f673 -r 38bb213f60ba phonebookui/Phonebook2/Commands/src/CPbk2CommandStore.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2CommandStore.cpp Wed Sep 15 11:56:55 2010 +0300 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2CommandStore.cpp Wed Oct 13 14:15:33 2010 +0300 @@ -18,7 +18,6 @@ // INCLUDE FILES #include "CPbk2CommandStore.h" -#include "MPbk2CommandResourceRelease.h" // Phonebook 2 #include @@ -223,25 +222,11 @@ MPbk2Command* arrayCmd = iCommandArray[j]; if (idleDestCmd == arrayCmd) { + // Remove from command array + iCommandArray.Remove(j); iIdleDestructableCommands.Remove(i); - - // Try to get MPbk2ResourceRelease interface. - TUid uid; - uid.iUid = MPbk2ResourceReleaseUID; - MPbk2ResourceRelease* release = static_cast(idleDestCmd->CommandExtension(uid)); - if (release) - { - // Call ReleaseResource before delete. - release->ReleaseResource(); - } - - // Remove from command array - iCommandArray.Remove(j); - delete idleDestCmd; idleDestCmd = NULL; - - break; } } } @@ -252,7 +237,7 @@ // CPbk2CommandStore::DestroyAllCommands // -------------------------------------------------------------------------- // -EXPORT_C void CPbk2CommandStore::DestroyAllCommands() +void CPbk2CommandStore::DestroyAllCommands() { // Delete objects in idle commands array using CommandFinished for (TInt i = 0; i < iCommandArray.Count(); ++i)