diff --git a/Main/chameleon-vision.iml b/Main/chameleon-vision.iml index 13d0e774e..bb72d8934 100644 --- a/Main/chameleon-vision.iml +++ b/Main/chameleon-vision.iml @@ -10,9 +10,6 @@ - - - diff --git a/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java b/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java index d9d8a6551..37a9dfde8 100644 --- a/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java +++ b/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java @@ -138,7 +138,10 @@ public class Camera { // update camera values camVals = new CameraValues(this); - if (prevVideoMode != null && !prevVideoMode.equals(newVideoMode)) { // if resolution changed + boolean hasPrevVideoMode = prevVideoMode != null; + boolean newVideoModeIsNew = hasPrevVideoMode && !prevVideoMode.equals(newVideoMode); + + if (newVideoModeIsNew || !hasPrevVideoMode) { UsbCam.setVideoMode(newVideoMode.getActualPixelFormat(), newVideoMode.width, newVideoMode.height, newVideoMode.fps); if (updateCvSource) { updateCvSource();