Merge pull request #756 from Csantucci/fix-night-dds-not-loaded

Bug fix for https://bugs.launchpad.net/or/+bug/1999253 Night .dds textures not loaded
openrails · Dec 22, 2022 · 6cf0e64 · 6cf0e64
2 parents 02e149c + c3f5c55
commit 6cf0e64
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/RunActivity/Viewer3D/Common/Helpers.cs b/Source/RunActivity/Viewer3D/Common/Helpers.cs
@@ -51,7 +51,8 @@ public static string GetNightTextureFile(Simulator simulator, string textureFile
         {
             var texturePath = Path.GetDirectoryName(textureFilePath);
             var textureName = Path.GetFileName(textureFilePath);
-            var nightTexturePath = !File.Exists(texturePath + @"\Night\" + textureName) ? Path.GetDirectoryName(texturePath) + @"\Night\" : texturePath + @"\Night\";
+            var nightTexturePath = !File.Exists(texturePath + @"\Night\" + textureName) &&
+                !File.Exists(texturePath + @"\Night\" + Path.ChangeExtension(textureName, ".dds")) ? Path.GetDirectoryName(texturePath) + @"\Night\" : texturePath + @"\Night\";
 
             if (!String.IsNullOrEmpty(nightTexturePath + textureName) && Path.GetExtension(nightTexturePath + textureName) == ".dds" && File.Exists(nightTexturePath + textureName))
             {