Fix issues from refactoring for VirtualRekordbox

Deep-Symmetry · May 5, 2024 · beef234 · beef234
1 parent 1899723
commit beef234
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/deepsymmetry/beatlink/VirtualCdj.java b/src/main/java/org/deepsymmetry/beatlink/VirtualCdj.java
@@ -986,7 +986,7 @@ public void run() {
                     try {
                         if (received && (packet.getAddress() != socket.get().getLocalAddress())) {
                             DeviceUpdate update = buildUpdate(packet);
-                            if (update != null) {
+                            if (update != null && isRunning()) {
                                 processUpdate(update);
                             }
                         }
@@ -1145,13 +1145,13 @@ public synchronized void stop() {
             matchingInterfaces.clear();
             updates.clear();
             setTempoMaster(null);
-            setDeviceNumber((byte)0);  // Set up for self-assignment if restarted.
 
             if (inOpusQuadCompatibilityMode()) {
                 // We were running in proxy mode, so we need to shut down VirtualRekordbox, and nothing further.
                 VirtualRekordbox.getInstance().stop();
                 proxyingForVirtualRekordbox.set(false);
                 deliverLifecycleAnnouncement(logger, false);
+                setDeviceNumber((byte)0);  // Set up for self-assignment if restarted.
                 return;
             }
 
@@ -1165,6 +1165,7 @@ public synchronized void stop() {
             socket.get().close();
             socket.set(null);
             deliverLifecycleAnnouncement(logger, false);
+            setDeviceNumber((byte)0);  // Set up for self-assignment if restarted.
         }
     }