From 626e8e34f03c6fc6a44b180aaf648151c2d99570 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 2 Jul 2020 18:53:02 -0400 Subject: [PATCH] v0.8.1a: added a safety check to gamescene's destroy function --- .../shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index 27a1ff636..f4a69459b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -502,7 +502,7 @@ public class GameScene extends PixelScene { public void destroy() { //tell the actor thread to finish, then wait for it to complete any actions it may be doing. - if (actorThread.isAlive()){ + if (actorThread != null && actorThread.isAlive()){ synchronized (GameScene.class){ synchronized (actorThread) { actorThread.interrupt();