From 019e4f8d7c1979fae6828c4038c01b8c80efdcf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Cs=C3=B6t=C3=B6nyi?= <dev@taibsu.de>
Date: Tue, 16 Jul 2019 15:14:50 +0200
Subject: [PATCH] hotfix. FFVIII wouldn't start correctly and experience
 exceptions. however it starts now but has various display issues and starting
 a new game doesn't work.

---
 Core/TextureHandler.cs | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/Core/TextureHandler.cs b/Core/TextureHandler.cs
index e5913448..c37ace46 100644
--- a/Core/TextureHandler.cs
+++ b/Core/TextureHandler.cs
@@ -228,7 +228,7 @@ public void Draw(Rectangle dst, Rectangle? src, Color color)
                         dst2 = new Rectangle();
                         //if all the pieces of Scales are correct they should all have the same scale.
                         Rectangle _src = Scale(src.Value, ScaleFactor);
-                        cnt = ToRectangle(Textures[c, r]);
+                        cnt = Textures[c, r] != null ? ToRectangle(Textures[c, r]) : new Rectangle();
                         cnt.Offset(offset);
                         if (cnt.Contains(_src))
                         {
@@ -291,13 +291,29 @@ protected void Init()
                 for (uint c = 0; c < Cols && Memory.graphics.GraphicsDevice != null; c++)
                 {
                     ArchiveWorker aw = new ArchiveWorker(Memory.Archives.A_MENU);
-                    string path = aw.GetListOfFiles().First(x => (x.IndexOf(string.Format(Filename, c + r * Cols + StartOffset), StringComparison.OrdinalIgnoreCase) >= 0));
-                    tex = new TEX(ArchiveWorker.GetBinaryFile(Memory.Archives.A_MENU, path));
-                    if (Classic == null && c2 < Cols) oldsize.X += tex.TextureData.Width;
-                    Texture2D pngTex = LoadPNG(path, Palette);
-                    Textures[c, r] = (UseBest(tex, pngTex, Palette, Colors));
-                    if (pngTex != null) Modded = true;
-                    if (c2 < Cols && Textures[c2,r2] != null) size.X += Textures[c2++, r2].Width;
+
+                    try
+                    {
+                        string path = aw.GetListOfFiles().First(s => s.IndexOf(string.Format(Filename, c + r * Cols + StartOffset), StringComparison.OrdinalIgnoreCase) >= 0);
+
+                        tex = new TEX(ArchiveWorker.GetBinaryFile(Memory.Archives.A_MENU, path));
+
+                        if (Classic == null && c2 < Cols)
+                            oldsize.X += tex.TextureData.Width;
+
+                        Texture2D pngTex = LoadPNG(path, Palette);
+                        Textures[c, r] = (UseBest(tex, pngTex, Palette, Colors));
+
+                        if (pngTex != null)
+                            Modded = true;
+
+                        if (c2 < Cols && Textures[c2, r2] != null)
+                            size.X += Textures[c2++, r2].Width;
+                    }
+                    catch (InvalidOperationException)
+                    {
+                        // couldn't find a match.
+                    }
                 }
                 if (Classic == null && r2 < Rows) oldsize.Y += tex.TextureData.Height;
                 if (r2 < Rows && Textures.LongLength > r2+c2-1 && Textures[c2 - 1, r2] != null) size.Y += Textures[c2 - 1, r2++].Height;