From ac7bd48d8722f7e0ce0c2b9e98e8fcffd56c5de0 Mon Sep 17 00:00:00 2001
From: Banks Troutman <bankst@roswellrobotics.com>
Date: Sun, 3 Nov 2019 15:09:01 -0500
Subject: [PATCH] Fix JPEG Image error

---
 Main/chameleon-vision.iml                                    | 3 ---
 .../main/java/com/chameleonvision/vision/camera/Camera.java  | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.26" level="project" />
-    <orderEntry type="library" name="Maven: org.msgpack:msgpack-core:0.8.18" level="project" />
-    <orderEntry type="library" name="Maven: org.msgpack:jackson-dataformat-msgpack:0.8.18" level="project" />
     <orderEntry type="library" name="Maven: io.javalin:javalin:3.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.31" level="project" />
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();