Don't throw in SongReader/VideoReader if XNB path doesn't normalize.

Thanks to @redmcg for identifying this inaccuracy!
FNA-XNA · Jun 3, 2024 · 65f98a8 · 65f98a8
1 parent e86dbcc
commit 65f98a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Content/ContentReaders/SongReader.cs b/src/Content/ContentReaders/SongReader.cs
@@ -39,10 +39,10 @@ protected internal override Song Read(ContentReader input, Song existingInstance
 			/* The path string includes the ".wma" extension. Let's see if this
 			 * file exists in a format we actually support...
 			 */
-			path = Normalize(path.Substring(0, path.Length - 4));
-			if (String.IsNullOrEmpty(path))
+			string realPath = Normalize(path.Substring(0, path.Length - 4));
+			if (!String.IsNullOrEmpty(realPath))
 			{
-				throw new ContentLoadException();
+				path = realPath;
 			}
 
 			int durationMs = input.ReadInt32();

diff --git a/src/Content/ContentReaders/VideoReader.cs b/src/Content/ContentReaders/VideoReader.cs
@@ -41,10 +41,10 @@ Video existingInstance
 			/* The path string includes the ".wmv" extension. Let's see if this
 			 * file exists in a format we actually support...
 			 */
-			path = Normalize(path.Substring(0, path.Length - 4));
-			if (String.IsNullOrEmpty(path))
+			string realPath = Normalize(path.Substring(0, path.Length - 4));
+			if (!String.IsNullOrEmpty(realPath))
 			{
-				throw new ContentLoadException();
+				path = realPath;
 			}
 
 			int durationMS = input.ReadObject<int>();