From aa9ff69ce109c48ff2f2ff515b75078e708d3e80 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 9 Oct 2003 05:16:37 +0000 Subject: [PATCH] 2003-10-09 Mike Kestner * generator/Property.cs : don't do new for Objects if FromNativeReturn returns null. [Fixes #48055] svn path=/trunk/gtk-sharp/; revision=18793 --- ChangeLog | 5 +++++ generator/Property.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6985a8b78..b17c82358 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-10-09 Mike Kestner + + * generator/Property.cs : don't do new for Objects if FromNativeReturn + returns null. [Fixes #48055] + 2003-10-08 Mike Kestner * */Makefile.in : rework the prefix handling for duncan's packaging. diff --git a/generator/Property.cs b/generator/Property.cs index 0f9d49d88..623c0d4c6 100644 --- a/generator/Property.cs +++ b/generator/Property.cs @@ -124,7 +124,7 @@ namespace GtkSharp.Generation { if (table.IsObject (c_type)) sw.WriteLine ("\t\t\t\tbool ref_owned = false;"); sw.WriteLine("\t\t\t\t" + cs_type + " ret = " + table.FromNativeReturn(c_type, "raw_ret") + ";"); - if (!table.IsBoxed (c_type)) + if (!table.IsBoxed (c_type) && !table.IsObject (c_type)) sw.WriteLine("\t\t\t\tif (ret == null) ret = new " + cs_type + "(raw_ret);"); } else { sw.Write("\t\t\t\t" + cs_type + " ret = ");