From ab206b2abf57603392dc76fb15dccbd7b48774a6 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 21 Jul 2021 09:13:05 -0400 Subject: [PATCH] Stop threads on vision shutdown --- src/main/java/com/volmit/iris/core/gui/VisionGUI.java | 7 +++++++ .../volmit/iris/engine/stream/utility/CachedStream2D.java | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java index 3209177b6..5b538a040 100644 --- a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java @@ -144,6 +144,13 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener help = false; } }); + frame.addWindowListener(new java.awt.event.WindowAdapter() { + @Override + public void windowClosing(java.awt.event.WindowEvent windowEvent) { + e.shutdown(); + eh.shutdown(); + } + }); } @Override diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java index 8d1632ec9..216580a08 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java @@ -50,10 +50,6 @@ public class CachedStream2D extends BasicStream implements ProceduralStrea @Override public T get(double x, double z) { - if (IrisComplex.cacheLock.get()) { - return stream.get((int) x, (int) z); - } - return cache.compute(Cache.key((int) x, (int) z), (k, v) -> v != null ? v : stream.get((int) x, (int) z)); }