konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.8.1: fixed a NPE when fonts are reset before being initialized

Browse Source
This commit is contained in:
Evan Debenham
2020-06-26 13:11:50 -04:00
parent 2d2a595655
commit 62e795a4d7
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java
+14 -12
View File
@@ -309,21 +309,23 @@ public class AndroidPlatformSupport extends PlatformSupport {
@Override @Override
public void resetGenerators() { public void resetGenerators() {
for (FreeTypeFontGenerator generator : fonts.keySet()){ if (fonts != null) {
for (BitmapFont f : fonts.get(generator).values()){ for (FreeTypeFontGenerator generator : fonts.keySet()) {
f.dispose(); for (BitmapFont f : fonts.get(generator).values()) {
f.dispose();
}
fonts.get(generator).clear();
generator.dispose();
} }
fonts.get(generator).clear(); fonts.clear();
generator.dispose(); if (packer != null) {
} for (PixmapPacker.Page p : packer.getPages()) {
fonts.clear(); p.getTexture().dispose();
if (packer != null){ }
for (PixmapPacker.Page p : packer.getPages()){ packer.dispose();
p.getTexture().dispose();
} }
packer.dispose(); fonts = null;
} }
fonts = null;
setupFontGenerators(pageSize, systemfont); setupFontGenerators(pageSize, systemfont);
} }
desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
+14 -12
View File
@@ -135,21 +135,23 @@ public class DesktopPlatformSupport extends PlatformSupport {
@Override @Override
public void resetGenerators() { public void resetGenerators() {
for (FreeTypeFontGenerator generator : fonts.keySet()){ if (fonts != null) {
for (BitmapFont f : fonts.get(generator).values()){ for (FreeTypeFontGenerator generator : fonts.keySet()) {
f.dispose(); for (BitmapFont f : fonts.get(generator).values()) {
f.dispose();
}
fonts.get(generator).clear();
generator.dispose();
} }
fonts.get(generator).clear(); fonts.clear();
generator.dispose(); if (packer != null) {
} for (PixmapPacker.Page p : packer.getPages()) {
fonts.clear(); p.getTexture().dispose();
if (packer != null){ }
for (PixmapPacker.Page p : packer.getPages()){ packer.dispose();
p.getTexture().dispose();
} }
packer.dispose(); fonts = null;
} }
fonts = null;
setupFontGenerators(pageSize, systemfont); setupFontGenerators(pageSize, systemfont);
} }