Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android crash fixes

Browse Source
This commit is contained in:
Anuken
2020-10-23 13:42:28 -04:00
parent 754aba9013
commit f5888a7c56
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/editor/MapView.java
View File

@@ -321,7 +321,7 @@ public class MapView extends Element implements GestureListener{
}
private boolean active(){
return Core.scene.getKeyboardFocus() != null
return Core.scene != null && Core.scene.getKeyboardFocus() != null
&& Core.scene.getKeyboardFocus().isDescendantOf(ui.editor)
&& ui.editor.isShown() && tool == EditorTool.zoom &&
Core.scene.hit(Core.input.mouse().x, Core.input.mouse().y, true) == this;