move _contentReadersCache

kniEngine · May 12, 2024 · 5fba42e · 5fba42e
1 parent 9b03f1a
commit 5fba42e
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/src/Xna.Framework.Content/Content/ContentTypeReaderManager.cs b/src/Xna.Framework.Content/Content/ContentTypeReaderManager.cs
@@ -74,26 +74,36 @@ internal ContentTypeReader[] LoadAssetReaders(ContentReader reader, int typeRead
                     int readerTypeVersion = reader.ReadInt32();
 
                     ContentTypeReader typeReader;
-                    Type typeReaderType;
                     if (!_contentTypeReadersCache.ContainsKey(readerTypeName))
                     {
-                        typeReaderType = ResolveReaderType(readerTypeName);
+                        Type typeReaderType = ResolveReaderType(readerTypeName);
                         _contentTypeReadersCache.Add(readerTypeName, typeReaderType);
-                    }
-                    else
-                    {
-                        typeReaderType = _contentTypeReadersCache[readerTypeName];
-                    }
 
-                    if (!_contentReadersCache.ContainsKey(typeReaderType))
-                    {
-                        typeReader = typeReaderType.GetDefaultConstructor().Invoke(null) as ContentTypeReader;
-                        needsInitialize[i] = true;
-                        _contentReadersCache.Add(typeReaderType, typeReader);
+                        if (!_contentReadersCache.ContainsKey(typeReaderType))
+                        {
+                            typeReader = typeReaderType.GetDefaultConstructor().Invoke(null) as ContentTypeReader;
+                            needsInitialize[i] = true;
+                            _contentReadersCache.Add(typeReaderType, typeReader);
+                        }
+                        else
+                        {
+                            typeReader = _contentReadersCache[typeReaderType];
+                        }
                     }
                     else
                     {
-                        typeReader = _contentReadersCache[typeReaderType];
+                        Type typeReaderType = _contentTypeReadersCache[readerTypeName];
+
+                        if (!_contentReadersCache.ContainsKey(typeReaderType))
+                        {
+                            typeReader = typeReaderType.GetDefaultConstructor().Invoke(null) as ContentTypeReader;
+                            needsInitialize[i] = true;
+                            _contentReadersCache.Add(typeReaderType, typeReader);
+                        }
+                        else
+                        {
+                            typeReader = _contentReadersCache[typeReaderType];
+                        }
                     }
 
                     if (readerTypeVersion != typeReader.TypeVersion)