--- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetImageCmd.cpp Fri Feb 19 22:40:27 2010 +0200
+++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetImageCmd.cpp Fri Mar 12 15:41:25 2010 +0200
@@ -141,12 +141,10 @@
if ( res && selectedFile->Count() > 0 )
{
- CAknWaitDialog* waitNote =
- new(ELeave) CAknWaitDialog(
+ iWaitNote = new(ELeave) CAknWaitDialog(
reinterpret_cast<CEikDialog**>( &iWaitNote ), ETrue );
- waitNote->ExecuteLD( R_QTN_GEN_NOTE_FETCHING );
- CleanupStack::PushL( waitNote );
-
+ iWaitNote->ExecuteLD( R_QTN_GEN_NOTE_FETCHING );
+
TPtrC fileName = (*selectedFile)[0];
// store reference to image field
@@ -157,8 +155,6 @@
iImageManager->SetImageAsyncL(
*iStoreContact, *iThumbnailFieldType, *this, fileName );
- CleanupStack::Pop( waitNote );
- iWaitNote = waitNote;
result = ETrue;
}
@@ -219,8 +215,8 @@
if ( err != KErrNone )
{
delete iWaitNote;
+ iWaitNote = NULL;
}
- iWaitNote = NULL;
}
}