From f244b0e3b4b1880320a4c56bbf918791a6c12401 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Sat, 5 Jul 2014 23:47:46 +0300 Subject: [PATCH] Fixed a crash while copying comments to properties. Signed-off-by: Dimitar Dobrev --- .../Passes/GetterSetterToPropertyAdvancedPass.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs index 8fb47dec..c60722a4 100644 --- a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs +++ b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs @@ -159,13 +159,16 @@ namespace CppSharp.Passes comment.Kind = getter.Comment.Kind; comment.BriefText = getter.Comment.BriefText; comment.Text = getter.Comment.Text; - comment.FullComment = new FullComment(); - comment.FullComment.Blocks.AddRange(getter.Comment.FullComment.Blocks); - if (setter != null && setter.Comment != null) + if (getter.Comment.FullComment != null) { - comment.BriefText += Environment.NewLine + setter.Comment.BriefText; - comment.Text += Environment.NewLine + setter.Comment.Text; - comment.FullComment.Blocks.AddRange(setter.Comment.FullComment.Blocks); + comment.FullComment = new FullComment(); + comment.FullComment.Blocks.AddRange(getter.Comment.FullComment.Blocks); + if (setter != null && setter.Comment != null) + { + comment.BriefText += Environment.NewLine + setter.Comment.BriefText; + comment.Text += Environment.NewLine + setter.Comment.Text; + comment.FullComment.Blocks.AddRange(setter.Comment.FullComment.Blocks); + } } property.Comment = comment; }