Captain-Chaos
/
WorldPainter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent NPE when 3D view has been removed from frame

master
Captain Chaos 2022-08-21 17:25:29 +02:00
parent 31aba184a0
commit 61d41c6ad0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
WorldPainter/WPGUI/src/main/java/org/pepsoft/worldpainter/threedeeview/ThreeDeeView.java
View File

@ -454,8 +454,13 @@ public class ThreeDeeView extends JComponent implements Dimension.Listener, Tile
private void scheduleTileForRendering(final Tile tile) {
// System.out.println("Scheduling tile for rendering: " + tile.getX() + ", " + tile.getY());
final JViewport parent = (JViewport) getParent();
if (parent == null) {
// This has been observed in the wild; possible after the 3D view has been removed from the 3D frame?
return;
}
if (SwingUtilities.isEventDispatchThread()) {
Rectangle visibleArea = ((JViewport) getParent()).getViewRect();
Rectangle visibleArea = parent.getViewRect();
Rectangle tileBounds = zoom(getTileBounds(tile));
if (tileBounds.intersects(visibleArea)) {
// The tile is (partially) visible, so it should be repainted
@ -481,7 +486,7 @@ public class ThreeDeeView extends JComponent implements Dimension.Listener, Tile
}
} else {
SwingUtilities.invokeLater(() -> {
Rectangle visibleArea = ((JViewport) getParent()).getViewRect();
Rectangle visibleArea = parent.getViewRect();
Rectangle tileBounds = zoom(getTileBounds(tile));
if (tileBounds.intersects(visibleArea)) {
// The tile is (partially) visible, so it should be repainted