Adds check for frame type with no frame game objects set

codec-xyz · Dec 15, 2023 · 7fac11d · 7fac11d
1 parent 80434a1
commit 7fac11d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Editor/PhotoFrameEditor.cs b/src/Editor/PhotoFrameEditor.cs
@@ -263,7 +263,7 @@ public override void OnInspectorGUI() {
 
 				GUILayout.Label($"{photoFrame.photoSourceSize.x}px x {photoFrame.photoSourceSize.y}px - {photoFrame.photo.name}");
 				GUILayout.Label($"{finalRes.x}px x {finalRes.y}px final resolution - " + (dataSave * 100f).ToString("0.00") + "% of original - " + (cutoutPercent * 100f).ToString("0.00") + "% cutout");
-				if(photoFrame.frameType != null && photoFrame.frameType.photoFrames.Length != 0) {
+				if(photoFrame.frameType != null && photoFrame.frameType.photoFrames != null && photoFrame.frameType.photoFrames.Length != 0) {
 					string frameInfo = new Fraction(frameAspectRatio).ToString().Replace("/", " \u2215 ") + " = " + frameAspectRatio.ToString("0.000");
 					GUILayout.Label($"Frame - {frameInfo}");
 				}

diff --git a/src/Special/PhotoFrameType.cs b/src/Special/PhotoFrameType.cs
@@ -31,7 +31,7 @@ public class PhotoFrameType : ScriptableObject {
 		public GameObject[] photoFrames;
 		public Vector2[] aspectRatios;
 
-		public bool haveFrames() => photoFrames?.Length > 0 && aspectRatios?.Length > 0;
+		public bool haveFrames() => photoFrames?.Length > 0 && aspectRatios?.Length > 0 && photoFrames.Where(a => a != null).Any();
 		public GameObject getFrame(int index) => photoFrames?.ElementAtOrDefault(index);
 
 		public GameObject getOrGenerateFrame(int index, float aspectRatio, out bool isGenerated, Vector2 size, bool doGeneration = true) {
@@ -121,7 +121,7 @@ public float getRatio(int index) {
 
 		public int? findFrame(float aspectRatio, bool needsExactMatch, out float frameAspectRatio) {
 			frameAspectRatio = aspectRatio;
-			if(aspectRatios == null || aspectRatios.Length == 0) return null;
+			if(aspectRatios == null || aspectRatios.Length == 0 || !haveFrames()) return null;
 
 			var frames = aspectRatios.Select((ratioVec, i) => {
 				float ratio = Utils.ConvertRatio(ratioVec, 0);