From 2e5c2bcddb7096ddcf2b4074ea2f2b0cdbd3b44d Mon Sep 17 00:00:00 2001
From: ori <oriagranat9@gmail.com>
Date: Tue, 17 Sep 2019 13:44:42 -0700
Subject: [PATCH 1/2] bug fix for creating a new cam

---
 .../java/com/chameleonvision/settings/SettingsManager.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
index f10254417..503a14001 100644
--- a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
+++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
@@ -91,8 +91,9 @@ public class SettingsManager {
     private void InitiateUsbCameras() {
         for (Map.Entry<String, UsbCameraInfo> entry : USBCamerasInfo.entrySet()) {
             var device = entry.getValue();
-            var camera = new UsbCamera(device.name, device.dev);
-            UsbCameras.put(device.name, camera);
+            var name = entry.getKey();
+            UsbCamera camera = new UsbCamera(name, device.dev);
+            UsbCameras.put(name, camera);
         }
     }
 

From 45916b3e1183b8280d894ae19a74ff9d14e7063a Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Wed, 18 Sep 2019 00:16:56 +0300
Subject: [PATCH 2/2] removed setCameraSettings function

---
 .../settings/SettingsManager.java             | 21 -------------------
 .../java/com/chameleonvision/web/Server.java  |  1 -
 2 files changed, 22 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
index 503a14001..7b0a06b36 100644
--- a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
+++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
@@ -224,27 +224,6 @@ public class SettingsManager {
     }
 
 
-    public void SetCameraSettings(String cameraName, String field, Object value) {
-        switch (field) {
-            case "brightness":
-                UsbCameras.get(cameraName).setBrightness((int) value);
-                break;
-            case "exposure":
-                UsbCameras.get(cameraName).setExposureManual((int) value);
-                break;
-            case "resolution":
-                VideoMode videoMode = UsbCameras.get(cameraName).enumerateVideoModes()[(int) value];
-                Camera cam = Cameras.get(cameraName);
-                cam.camVideoMode.height = videoMode.height;
-                cam.camVideoMode.width = videoMode.width;
-                cam.camVideoMode.fps = videoMode.fps;
-                //cam.camVideoMode.pixel_format=videoMode.pixelFormat.toString().split(".")[1];//legacy from python
-                cam.camVideoMode.pixel_format = videoMode.pixelFormat.toString();
-                break;
-        }
-
-    }
-
     //Savers
     public void SaveSettings() {
         SaveCameras();
diff --git a/Main/src/main/java/com/chameleonvision/web/Server.java b/Main/src/main/java/com/chameleonvision/web/Server.java
index 37dbcd88d..618e0df68 100644
--- a/Main/src/main/java/com/chameleonvision/web/Server.java
+++ b/Main/src/main/java/com/chameleonvision/web/Server.java
@@ -71,7 +71,6 @@ public class Server {
                             int newResolution = (int) value;
                             System.out.printf("Changing resolution mode to %d\n", newResolution);
                             SettingsManager.getInstance().GetCurrentCamera().resolution = newResolution;
-                            SettingsManager.getInstance().SetCameraSettings(SettingsManager.GeneralSettings.curr_camera, "resolution", newResolution);
                             SettingsManager.getInstance().SaveSettings();
                             break;
                         case "fov":