Prevent crash when using fonts in a relative resource project. Resolves

#143
raeleus · Mar 4, 2024 · fc7cbd8 · fc7cbd8
1 parent a124ec4
commit fc7cbd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@
 * Refactored Scene Composer and fixed various errors. Resolves #135. Thanks deviodesign!
 * Added more finite control of scale in settings. Thanks ChinQingl
 * Fixed FreeTypeFontGenerator from creating glyphs with the wrong page index if there are multiple pages
+* Prevent crash when using fonts in a relative resource project. Resolves #143. Thanks SonicNorg!
 
 ### Skin Composer Version 56 ###
 * Fixed font scaling issues.

diff --git a/core/src/com/ray3k/skincomposer/dialog/DialogFonts.java b/core/src/com/ray3k/skincomposer/dialog/DialogFonts.java
@@ -417,9 +417,11 @@ public boolean touchDown(InputEvent event, float x, float y, int pointer, int bu
                 if (bf.imagePaths.length > 0) {
                     FileHandle file = new FileHandle(bf.imagePaths[0]);
                     if (!file.exists()) {
-                        file = bf.fontFile.sibling(bf.fontFile.nameWithoutExtension() + ".png");
+                        file = font.file.sibling(bf.fontFile.nameWithoutExtension() + ".png");
                     }
-                    if (Utils.brightness(Utils.averageEdgeColor(file)) < .5f) {
+                    if (!file.exists()) {
+                        bg.setColor(Color.BLACK);
+                    } else if (Utils.brightness(Utils.averageEdgeColor(file)) < .5f) {
                         bg.setColor(Color.WHITE);
                     } else {
                         bg.setColor(Color.BLACK);