v2.0.2: fixed runaway memory usage with new action indicator

00-Evan · 00-Evan · commit 9ff36ae1023d · 2023-04-13T13:28:04.000-04:00
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java
@@ -96,10 +96,12 @@ public synchronized void update() {
 
 		if (needsRefresh){
 			if (primaryVis != null) {
+				primaryVis.destroy();
 				primaryVis.killAndErase();
 				primaryVis = null;
 			}
 			if (secondVis != null){
+				secondVis.destroy();
 				secondVis.killAndErase();
 				secondVis = null;
 			}
@@ -112,11 +114,11 @@ public synchronized void update() {
 					add(secondVis);
 				}
 
-				needsRefresh = true;
 				setColor(action.indicatorColor());
 			}
 
 			layout();
+			needsRefresh = false;
 		}
 
 		if (!Dungeon.hero.ready){

Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,12 @@ public synchronized void update() {`
`96`	`96`
`97`	`97`	`if (needsRefresh){`
`98`	`98`	`if (primaryVis != null) {`
	`99`	`+ primaryVis.destroy();`
`99`	`100`	`primaryVis.killAndErase();`
`100`	`101`	`primaryVis = null;`
`101`	`102`	`}`
`102`	`103`	`if (secondVis != null){`
	`104`	`+ secondVis.destroy();`
`103`	`105`	`secondVis.killAndErase();`
`104`	`106`	`secondVis = null;`
`105`	`107`	`}`
`@@ -112,11 +114,11 @@ public synchronized void update() {`
`112`	`114`	`add(secondVis);`
`113`	`115`	`}`
`114`	`116`
`115`		`- needsRefresh = true;`
`116`	`117`	`setColor(action.indicatorColor());`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`layout();`
	`121`	`+ needsRefresh = false;`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`if (!Dungeon.hero.ready){`