Skip to content

Commit

Permalink
Release embedded message after fixing conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Bill Long committed Feb 4, 2016
1 parent 48b5a08 commit 718452f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 0 deletions.
Binary file modified MAPIFolders/MAPIFolders.rc
Binary file not shown.
1 change: 1 addition & 0 deletions MAPIFolders/ResolveConflictsOperation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ void ResolveConflictsOperation::ProcessItem(LPMAPIPROP lpMessage, LPCTSTR pwzSub
CORg(lpAttach->OpenProperty(PR_ATTACH_DATA_OBJ, (LPIID)&IID_IMessage, 0, MAPI_MODIFY, (LPUNKNOWN *)&lpEmbeddedMessage));
CORg(lpEmbeddedMessage->CopyTo(0, NULL, NULL, NULL, NULL, (LPGUID)&IID_IMessage, lpMessage, 0, NULL));
CORg(lpMessage->SaveChanges(0));
lpEmbeddedMessage->Release();

*pLog << " Conflict resolved." << "\n";
break;
Expand Down

0 comments on commit 718452f

Please sign in to comment.