From c2cf5a8ad1cd93746fcf0c9975431abefd1642b2 Mon Sep 17 00:00:00 2001 From: Banks Troutman Date: Sun, 1 Dec 2019 15:40:02 -0500 Subject: [PATCH] Multi-camera fix --- .../main/java/com/chameleonvision/vision/VisionManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionManager.java b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionManager.java index 11352b9a0..d4d42c662 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionManager.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionManager.java @@ -61,7 +61,7 @@ public class VisionManager { // load the config List preliminaryConfigs = new ArrayList<>(); - usbCameraInfosByCameraName.values().forEach((cameraInfo) -> { + usbCameraInfosByCameraName.forEach((suffixedName, cameraInfo) -> { String truePath; if (Platform.CurrentPlatform.isWindows()) { @@ -70,7 +70,7 @@ public class VisionManager { truePath = Arrays.stream(cameraInfo.otherPaths).filter(x -> x.contains("/dev/v4l/by-path")).findFirst().orElse(cameraInfo.path); } - preliminaryConfigs.add(new CameraJsonConfig(truePath, cameraInfo.name)); + preliminaryConfigs.add(new CameraJsonConfig(truePath, suffixedName)); }); loadedCameraConfigs.addAll(ConfigManager.initializeCameras(preliminaryConfigs));