diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2012-03-29 20:39:52 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2012-03-29 20:39:52 +1000 |
| commit | 0fd4afb068ab88fc12d76270ad739d688808afd1 (patch) | |
| tree | 847604ef548dd21669e9afe81dc219ca391d6d47 /src | |
| parent | 1c785abde7c318b361b6a068a085b4aac0cfbf42 (diff) | |
| parent | b60f2ecc85507c066129d34a1cea8510d6a860eb (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging:
Pointer check added
Diffstat (limited to 'src')
| -rw-r--r-- | src/messaging/qfsengine_symbian.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/messaging/qfsengine_symbian.cpp b/src/messaging/qfsengine_symbian.cpp index 63cbcaa47a..0a08a69f2d 100644 --- a/src/messaging/qfsengine_symbian.cpp +++ b/src/messaging/qfsengine_symbian.cpp @@ -2843,7 +2843,6 @@ QByteArray CFSEngine::attachmentContent(long int messageId, TMessageContentId at { QByteArray content; - TMailboxId mailBoxId(attachmentContentId.iMessageId.iFolderId.iMailboxId); MEmailAttachment* attachment = attachmentById(attachmentContentId); if (attachment) { TRAP_IGNORE( @@ -3229,7 +3228,8 @@ void CFSContentStructureFetchOperation::DataFetchedL(const TInt aResult) CFSMessagesFindOperation::CFSMessagesFindOperation(CFSEngine& aOwner, int aOperationId) : m_owner(aOwner), m_operationId(aOperationId), - m_resultCorrectlyOrdered(false) + m_resultCorrectlyOrdered(false), + m_clientApi(0) { TRAPD(err, m_factory = CEmailInterfaceFactory::NewL(); @@ -3246,8 +3246,9 @@ CFSMessagesFindOperation::~CFSMessagesFindOperation() operation.m_mailbox->Release(); } } - - m_clientApi->Release(); + if (m_clientApi) { + m_clientApi->Release(); + } delete m_factory; } |