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

v1.3.0: fixed toolbar instance persisting when it shouldn't

Browse Source
This commit is contained in:
Evan Debenham
2022-06-24 11:52:44 -04:00
parent 2fe21792d2
commit 9ac770a140
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
+12 -4
View File
@@ -74,7 +74,13 @@ public class Toolbar extends Component {
height = btnInventory.height(); height = btnInventory.height();
} }
@Override
public synchronized void destroy() {
super.destroy();
if (instance == this) instance = null;
}
@Override @Override
protected void createChildren() { protected void createChildren() {
@@ -406,8 +412,10 @@ public class Toolbar extends Component {
private static CellSelector.Listener informer = new CellSelector.Listener() { private static CellSelector.Listener informer = new CellSelector.Listener() {
@Override @Override
public void onSelect( Integer cell ) { public void onSelect( Integer cell ) {
instance.examining = false; if (instance != null) {
GameScene.examineCell( cell ); instance.examining = false;
GameScene.examineCell(cell);
}
} }
@Override @Override
public String prompt() { public String prompt() {
@@ -527,7 +535,7 @@ public class Toolbar extends Component {
@Override @Override
public synchronized void destroy() { public synchronized void destroy() {
super.destroy(); super.destroy();
SWAP_INSTANCE = null; if (SWAP_INSTANCE == this) SWAP_INSTANCE = null;
} }
@Override @Override