diff --git a/server/core/src/main/java/dev/slimevr/driver/behaviours.kt b/server/core/src/main/java/dev/slimevr/driver/behaviours.kt index 1b4768879..9078b0bb1 100644 --- a/server/core/src/main/java/dev/slimevr/driver/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/driver/behaviours.kt @@ -141,7 +141,7 @@ class DriverIncomingTrackersBehaviour : DriverBridgeBehaviour { receiver.appContext.server.getTracker(trackerId)?.context?.dispatch( TrackerActions.SetStatus(status = event.status), ) - } + }.launchIn(receiver.context.scope) receiver.inbound.on { event -> val trackerId = receiver.context.state.value.trackers[event.id] ?: return@on diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt b/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt index 4b8a03dec..40e1330f3 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt @@ -43,7 +43,13 @@ val solarxrToProtoStatus = mapOf( solarxr_protocol.datatypes.TrackerStatus.DISCONNECTED to TrackerStatus.Status.DISCONNECTED, solarxr_protocol.datatypes.TrackerStatus.BUSY to TrackerStatus.Status.BUSY, ) -val protoToSolarxrStatus = solarxrToProtoStatus.entries.associate { (k, v) -> v to k } +val protoToSolarxrStatus = mapOf( + TrackerStatus.Status.OK to solarxr_protocol.datatypes.TrackerStatus.OK, + TrackerStatus.Status.ERROR to solarxr_protocol.datatypes.TrackerStatus.ERROR, + TrackerStatus.Status.OCCLUDED to solarxr_protocol.datatypes.TrackerStatus.OCCLUDED, + TrackerStatus.Status.DISCONNECTED to solarxr_protocol.datatypes.TrackerStatus.DISCONNECTED, + TrackerStatus.Status.BUSY to solarxr_protocol.datatypes.TrackerStatus.BUSY, +) const val PROTOCOL_VERSION = 2