Merge pull request #529 from nicost/OpenCV2

OpenCV: Now backward compatible with previous config files.
micro-manager · Nov 22, 2024 · 870fdb1 · 870fdb1
2 parents 7d951c2 + f51a95c
commit 870fdb1
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp
@@ -177,9 +177,8 @@ COpenCVgrabber::COpenCVgrabber() :
          AddAllowedValue(cIDName, devices.at(i).deviceName.c_str());
       }
    }
-   else {
-      AddAllowedValue(cIDName, "Undefined");
-   }
+   // when no devices are found and for backward compatibility, allow the Undefined value
+   AddAllowedValue(cIDName, "Undefined");
 #else
    String cIDNameReally = "Camera Number";
    CPropertyAction* pAct = new CPropertyAction(this, &COpenCVgrabber::OnCameraID);
@@ -1097,8 +1096,8 @@ int COpenCVgrabber::OnCameraID(MM::PropertyBase* pProp, MM::ActionType eAct)
             return DEVICE_OK;
          }
       }
+      pProp->Set("Undefined");
    }
-   return DEVICE_NOT_CONNECTED;
 #else
    if (eAct == MM::AfterSet)
    {