From 167060ee36a594133d162071b58dca7f9fa09a0a Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Mon, 5 Nov 2012 02:39:48 -0500
Subject: [PATCH] ecere/com/instance: Fixed application evolution - Fixed
 previous Android commit breaking normal desktop application (i.e. the IDE)

---
 ecere/src/com/instance.ec | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/ecere/src/com/instance.ec b/ecere/src/com/instance.ec
index 02e4165..3e65b5c 100644
--- a/ecere/src/com/instance.ec
+++ b/ecere/src/com/instance.ec
@@ -4206,12 +4206,12 @@ public dllexport Method eClass_FindMethod(Class _class, char * name, Module modu
 }
 
 // Construct an instance
-static bool ConstructInstance(void * instance, Class _class)
+static bool ConstructInstance(void * instance, Class _class, Class from)
 {
    if(_class.templateClass) _class = _class.templateClass;
-   if(_class.base)
+   if(_class.base && from != _class.base)
    {
-      if(!ConstructInstance(instance, _class.base))
+      if(!ConstructInstance(instance, _class.base, from))
          return false;
    }
    if(_class.Initialize)
@@ -4267,7 +4267,7 @@ public dllexport void * eInstance_New(Class _class)
          // Copy the virtual table initially
          instance._vTbl = _class._vTbl;
       }
-      if(!ConstructInstance(instance, _class))
+      if(!ConstructInstance(instance, _class, null))
       {
          _free(instance);
          instance = null;
@@ -4284,6 +4284,7 @@ public dllexport void eInstance_Evolve(Instance * instancePtr, Class _class)
    {
       bool wasApp = false, wasGuiApp = false;
       Instance instance = (Instance)renew *instancePtr byte[_class.structSize];
+      Class fromClass = instance._class;
       *instancePtr = instance;
       memset(((byte *)instance) + instance._class.structSize, 0, _class.structSize - instance._class.structSize);
       // Fix pointers to application
@@ -4381,29 +4382,12 @@ public dllexport void eInstance_Evolve(Instance * instancePtr, Class _class)
       // Copy the virtual table initially
       instance._vTbl = _class._vTbl;
 
-      if(_class.Constructor)
-      {
-         if(!_class.Constructor(instance))
-         {
-            for(; _class; _class = _class.base)
-            {
-               if(_class.templateClass) _class = _class.templateClass;
-               if(_class.Destructor)
-                  _class.Destructor(instance);
-            }
-            _free(instance);
-            *instancePtr = null;
-         }
-      }
-      (_class.templateClass ? _class.templateClass : _class).count++;
       // We don't want to reconstruct the portion already constructed...
-      /*
-      if(!ConstructInstance(instance, _class))
+      if(!ConstructInstance(instance, _class, fromClass))
       {
          _free(instance);
          *instancePtr = null;
       }
-      */
    }
 }
 
-- 
1.8.3.1