Fix devices not being released when computer is destroyed while running.

fnuecke · Jan 30, 2022 · d6a9360 · d6a9360
1 parent ab69c69
commit d6a9360
Showing 1 changed file with 20 additions and 23 deletions.
diff --git a/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java b/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java
@@ -163,16 +163,7 @@ public void start() {
 
     @Override
     public void stop() {
-        switch (runState) {
-            case LOADING_DEVICES -> setRunState(VMRunState.STOPPED);
-            case RUNNING -> stopRunnerAndReset();
-        }
-    }
-
-    private void joinWorkerThread() {
-        if (runner != null) {
-            runner.join();
-        }
+        stopRunnerAndReset();
     }
 
     public void pauseAndReload() {
@@ -190,19 +181,6 @@ public void resume(final boolean didDevicesChange) {
         state.rpcAdapter.resume(busController, didDevicesChange);
     }
 
-    protected void stopRunnerAndReset() {
-        joinWorkerThread();
-        setRunState(VMRunState.STOPPED);
-
-        state.board.setRunning(false);
-        state.board.reset();
-        state.rpcAdapter.reset();
-        state.rpcAdapter.disposeDevices();
-        state.vmAdapter.disposeDevices();
-
-        runner = null;
-    }
-
     public void tick() {
         busController.scan();
         setBusState(busController.getState());
@@ -284,8 +262,27 @@ protected void error(@Nullable final Component message, final boolean reset) {
         setBootError(message);
     }
 
+    protected void stopRunnerAndReset() {
+        joinWorkerThread();
+        setRunState(VMRunState.STOPPED);
+
+        state.board.setRunning(false);
+        state.board.reset();
+        state.rpcAdapter.reset();
+        state.rpcAdapter.disposeDevices();
+        state.vmAdapter.disposeDevices();
+
+        runner = null;
+    }
+
     ///////////////////////////////////////////////////////////////////
 
+    private void joinWorkerThread() {
+        if (runner != null) {
+            runner.join();
+        }
+    }
+
     private void load() {
         if (loadDevicesDelay > 0) {
             loadDevicesDelay--;