New: Update version, moved type assignment

neolithos · Dec 21, 2014 · af58d08 · af58d08
1 parent bc56ff7
commit af58d08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/NeoLua/LuaType.cs b/NeoLua/LuaType.cs
@@ -431,7 +431,7 @@ public DynamicMetaObject GetMetaObject(Expression parameter)
     private void ResolveType()
     {
       if (parent != null && // the root has no type
-          iAssemblyCount >= 0) // Namespace, there is no type7
+          iAssemblyCount >= 0) // Namespace, there is no type
       {
         Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
         string sTypeName = FullName;
@@ -482,13 +482,13 @@ private void ResolveType()
 
 		private bool SetType(Type type, bool lUpdateKnownTypes)
 		{
-			// set the value
-			this.type = type;
-
 			if (type == null)
 				return false;
 			else
 			{
+				// set the value
+				this.type = type;
+
 				// update the base type
 				baseType = type.BaseType != null ? LuaType.GetType(type.BaseType) : null;
 

diff --git a/NeoLua/Properties/AssemblyInfoGlobal.cs b/NeoLua/Properties/AssemblyInfoGlobal.cs
@@ -6,4 +6,4 @@
 [assembly: AssemblyTrademark("")]
 
 [assembly: AssemblyVersion("5.3.0.0")]
-[assembly: AssemblyFileVersion("0.9.9.0")]
+[assembly: AssemblyFileVersion("0.9.10.0")]