Stop threads on vision shutdown

This commit is contained in:
Daniel Mills 2021-07-21 09:13:05 -04:00
parent 2f8a65d364
commit ab206b2abf
2 changed files with 7 additions and 4 deletions

View File

@ -144,6 +144,13 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener
help = false; help = false;
} }
}); });
frame.addWindowListener(new java.awt.event.WindowAdapter() {
@Override
public void windowClosing(java.awt.event.WindowEvent windowEvent) {
e.shutdown();
eh.shutdown();
}
});
} }
@Override @Override

View File

@ -50,10 +50,6 @@ public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStrea
@Override @Override
public T get(double x, double z) { 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)); return cache.compute(Cache.key((int) x, (int) z), (k, v) -> v != null ? v : stream.get((int) x, (int) z));
} }