mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-20 03:04:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix thread switch

Browse Source
This commit is contained in:
Daniel Mills 2021-07-29 14:48:32 -04:00
parent 9a43f868aa
commit 6dad50aab1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/volmit/iris/core/gui/VisionGUI.java
View File

@ -168,14 +168,13 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener
try try
{ {
engine = IrisWorlds.access(world.realWorld()).getCompound().getEngine(index); engine = IrisWorlds.access(world.realWorld()).getCompound().getEngine(index);
return !engine.isClosed();
} }
catch(Throwable e) catch(Throwable e)
{ {
engine = IrisWorlds.access(world.realWorld()).getCompound().getDefaultEngine();
}
return true; }
} }
} }

4
src/main/java/com/volmit/iris/engine/framework/EngineTarget.java
View File

@ -55,7 +55,7 @@ public class EngineTarget {
} }
public void close() { public void close() {
parallaxBurster.shutdownAndAwait(); parallaxBurster.shutdownLater();
burster.shutdownAndAwait(); burster.shutdownLater();
} }
} }

5
src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java
View File

@ -21,6 +21,7 @@ package com.volmit.iris.engine.parallel;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.scheduling.J;
import java.util.concurrent.*; import java.util.concurrent.*;
@ -96,6 +97,10 @@ public class MultiBurst {
service.shutdown(); service.shutdown();
} }
public void shutdownLater() {
J.a(service::shutdown, 100);
}
public void shutdownAndAwait() { public void shutdownAndAwait() {
service.shutdown(); service.shutdown();