Browse files

Merge pull request #1716 from danzel/develop

Remove File extension check that only causes failure. - tested against the android build using cocos2d-xna tests with both standard content and custom content loaders. no regression detected.
  • Loading branch information...
2 parents 166846b + dfaeb3a commit edcfc7fbe49d6485e513fa5baabdfff80cadd4ac @totallyeviljake totallyeviljake committed May 8, 2013
Showing with 0 additions and 9 deletions.
  1. +0 −9 MonoGame.Framework/Content/ContentTypeReader.cs
View
9 MonoGame.Framework/Content/ContentTypeReader.cs
@@ -114,12 +114,6 @@ internal static string Normalize(string fileName, string[] extensions)
if (files.Any(s => s == file))
return fileName;
- // Check the file extension
- if (!string.IsNullOrEmpty(Path.GetExtension(fileName)))
- {
- return null;
- }
-
// FirstOrDefault returns null as the default if the file is not found. This crashed Path.Combine so check
// for it first.
string file2 = files.FirstOrDefault(s => extensions.Any(ext => s.ToLower() == (file.ToLower() + ext)));
@@ -137,9 +131,6 @@ public static string Normalize(string fileName, string[] extensions)
if (File.Exists(fileName))
return fileName;
#endif
- // Check the file extension
- if (!string.IsNullOrEmpty(Path.GetExtension(fileName)))
- return null;
foreach (string ext in extensions)
{

0 comments on commit edcfc7f

Please sign in to comment.