From 541cf257238ae30acef0f46064c201dc5a84a674 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 8 Nov 2013 00:51:22 +0100
Subject: [PATCH] eo2: eo2_add_internal_end() return NULL if do_error is set

---
 src/lib/eo/eo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index f5a77b6..24da48a 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -720,7 +720,7 @@ eo2_add_internal_end(const char *file, int line, const Eo *eo_id)
         return NULL;
      }
 
-   if (!fptr->obj->condtor_done)
+   if (!fptr->obj->condtor_done || fptr->obj->do_error)
      {
         ERR("in %s:%d: Object of class '%s' - Not all of the object constructors have been executed.",
             file, line, fptr->cur_klass->desc->name);
-- 
2.7.4