diff options
author | 2013-04-28 13:13:25 -0600 | |
---|---|---|
committer | 2013-04-28 13:13:25 -0600 | |
commit | 10c9d0abf0e8009277fb2006cffb76b8a26865c7 (patch) | |
tree | 73dd16206a521984a5a26b479038a4d7300070c9 /src/objc/abstract/MCOAbstractMessageRendererCallback.mm | |
parent | 6216eee4d6c6514c2b1e324d1a999b0d7018ab7a (diff) | |
parent | 9a5c778214090b9c0fa58d65521c35b01cbcd663 (diff) |
Merge remote-tracking branch 'upstream/master' into Providers-API
Merge upstream/master
Diffstat (limited to 'src/objc/abstract/MCOAbstractMessageRendererCallback.mm')
-rw-r--r-- | src/objc/abstract/MCOAbstractMessageRendererCallback.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/objc/abstract/MCOAbstractMessageRendererCallback.mm b/src/objc/abstract/MCOAbstractMessageRendererCallback.mm index 8905acf5..883cb25f 100644 --- a/src/objc/abstract/MCOAbstractMessageRendererCallback.mm +++ b/src/objc/abstract/MCOAbstractMessageRendererCallback.mm @@ -104,7 +104,7 @@ mailcore::String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessag { mailcore::String * result = NULL; if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForEmbeddedMessage:)]) { - return MCO_FROM_OBJC(mailcore::String, [mRendererDelegate MCOAbstractMessage_templateForEmbeddedMessage:mMessage]); + result = MCO_FROM_OBJC(mailcore::String, [mRendererDelegate MCOAbstractMessage_templateForEmbeddedMessage:mMessage]); } if (result == NULL) { result = mailcore::HTMLRendererTemplateCallback::templateForEmbeddedMessage(); @@ -116,7 +116,7 @@ mailcore::String * MCOAbstractMessageRendererCallback::templateForEmbeddedMessag { mailcore::String * result = NULL; if ([mRendererDelegate respondsToSelector:@selector(MCOAbstractMessage_templateForEmbeddedMessageHeader:)]) { - return MCO_FROM_OBJC(mailcore::String, [mRendererDelegate MCOAbstractMessage_templateForEmbeddedMessageHeader:mMessage]); + result = MCO_FROM_OBJC(mailcore::String, [mRendererDelegate MCOAbstractMessage_templateForEmbeddedMessageHeader:mMessage]); } if (result == NULL) { result = mailcore::HTMLRendererTemplateCallback::templateForEmbeddedMessageHeader(); |