Merge pull request #2630 from ludovic-henry/fix-registeredwaithandle-leak

[mono.git] / mcs / mcs / method.cs

diff --git a/mcs/mcs/method.cs b/mcs/mcs/method.cs
index d1e0b3e2b83027c080f3cd70b615ba25f28411b2..e6213c7e43e3228c2bad5d7548640d2ecbd54599 100644 (file)
--- a/mcs/mcs/method.cs
+++ b/mcs/mcs/method.cs
@@ -1767,8 +1767,12 @@ namespace Mono.CSharp {
                                // If we use a "this (...)" constructor initializer, then
                                // do not emit field initializers, they are initialized in the other constructor
                                //
-                               if (!(Initializer is ConstructorThisInitializer))
+                               if (!(Initializer is ConstructorThisInitializer)) {
+                                       var errors = Compiler.Report.Errors;
                                        Parent.PartialContainer.ResolveFieldInitializers (bc);
+                                       if (errors != Compiler.Report.Errors)
+                                               return;
+                               }
 
                                if (!IsStatic) {
                                        if (Initializer == null && Parent.PartialContainer.Kind == MemberKind.Class) {