v2.1.3: added some sync and safety checks to action indicator

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java

@@ -136,7 +136,7 @@ public class HeroSelectScene extends PixelScene {
 
 				Dungeon.hero = null;
 				Dungeon.daily = Dungeon.dailyReplay = false;
-				ActionIndicator.action = null;
+				ActionIndicator.clearAction();
 				InterlevelScene.mode = InterlevelScene.Mode.DESCEND;
 
 				Game.switchScene( InterlevelScene.class );
@@ -662,7 +662,7 @@ public class HeroSelectScene extends PixelScene {
 
 									Dungeon.hero = null;
 									Dungeon.daily = true;
-									ActionIndicator.action = null;
+									ActionIndicator.clearAction();
 									InterlevelScene.mode = InterlevelScene.Mode.DESCEND;
 
 									Game.switchScene( InterlevelScene.class );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java

@@ -83,10 +83,11 @@ public class ActionIndicator extends Tag {
 	private boolean needsRefresh = false;
 	
 	@Override
-	public synchronized void update() {
+	public void update() {
 		super.update();
 
-		if (!visible && action != null){
+		synchronized (ActionIndicator.class) {
+			if (!visible && action != null) {
 				visible = true;
 				needsRefresh = true;
 				flash();
@@ -94,13 +95,13 @@ public class ActionIndicator extends Tag {
 				visible = action != null;
 			}
 
-		if (needsRefresh){
+			if (needsRefresh) {
 				if (primaryVis != null) {
 					primaryVis.destroy();
 					primaryVis.killAndErase();
 					primaryVis = null;
 				}
-			if (secondVis != null){
+				if (secondVis != null) {
 					secondVis.destroy();
 					secondVis.killAndErase();
 					secondVis = null;
@@ -110,7 +111,7 @@ public class ActionIndicator extends Tag {
 					add(primaryVis);
 
 					secondVis = action.secondaryVisual();
-				if (secondVis != null){
+					if (secondVis != null) {
 						add(secondVis);
 					}
 
@@ -121,13 +122,14 @@ public class ActionIndicator extends Tag {
 				needsRefresh = false;
 			}
 
-		if (!Dungeon.hero.ready){
+			if (!Dungeon.hero.ready) {
 				if (primaryVis != null) primaryVis.alpha(0.5f);
 				if (secondVis != null) secondVis.alpha(0.5f);
 			} else {
 				if (primaryVis != null) primaryVis.alpha(1f);
 				if (secondVis != null) secondVis.alpha(1f);
 			}
+		}
 
 	}
 
@@ -149,21 +151,31 @@ public class ActionIndicator extends Tag {
 	}
 
 	public static void setAction(Action action){
+		synchronized (ActionIndicator.class) {
 			ActionIndicator.action = action;
 			refresh();
 		}
+	}
+
+	public static void clearAction(){
+		clearAction(null);
+	}
 
 	public static void clearAction(Action action){
-		if (ActionIndicator.action == action) {
+		synchronized (ActionIndicator.class) {
+			if (action == null || ActionIndicator.action == action) {
 				ActionIndicator.action = null;
 			}
 		}
+	}
 
 	public static void refresh(){
-		if (instance != null){
+		synchronized (ActionIndicator.class) {
+			if (instance != null) {
 				instance.needsRefresh = true;
 			}
 		}
+	}
 
 	public interface Action {
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java

@@ -122,7 +122,7 @@ public class WndGameInProgress extends Window {
 				
 				Dungeon.hero = null;
 				Dungeon.daily = Dungeon.dailyReplay = false;
-				ActionIndicator.action = null;
+				ActionIndicator.clearAction();
 				InterlevelScene.mode = InterlevelScene.Mode.CONTINUE;
 				ShatteredPixelDungeon.switchScene(InterlevelScene.class);
 			}