--- a/emailuis/emailui/src/FreestyleEmailUiSendAttachmentsListControl.cpp Tue May 11 15:57:15 2010 +0300
+++ b/emailuis/emailui/src/FreestyleEmailUiSendAttachmentsListControl.cpp Tue May 25 12:23:16 2010 +0300
@@ -432,10 +432,11 @@
static_cast<CNcsComposeView*>( iAppUi->View(MailEditorId) );
TFSMailMsgId nullId;
+ TInt err( KErrNone );
if ( composeView->NewMessage() )
{
// use composeview NewMessage if available
- msgPart = composeView->NewMessage()->AddNewAttachmentL( filePath, nullId );
+ TRAP( err, msgPart = composeView->NewMessage()->AddNewAttachmentL( filePath, nullId ));
}
else
{
@@ -447,10 +448,19 @@
iVisualiser->EditorParams().iMsgId,
EFSMsgDataStructure );
CleanupStack::PushL( msg );
- msgPart = msg->AddNewAttachmentL( filePath, nullId );
+ TRAP( err, msgPart = msg->AddNewAttachmentL( filePath, nullId ));
CleanupStack::PopAndDestroy( msg );
}
CleanupStack::PushL( msgPart );
+ if( KErrNone != err)
+ {
+ if( iWaitNote )
+ {
+ iWaitNote->ProcessFinishedL();
+ }
+ iAttachmentAddingLocked = EFalse;
+ User::Leave( err );
+ }
msgPart->SaveL();
// append file to list model