Skip to content

Commit

Permalink
Merge pull request #477 from micro-manager/fix-get-installed-devices-…
Browse files Browse the repository at this point in the history
…check

Revert pull request #476
  • Loading branch information
marktsuchida authored Jul 5, 2024
2 parents 36c45e6 + 885fd98 commit b666b63
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions MMCore/MMCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7526,19 +7526,11 @@ MM::DeviceDetectionStatus CMMCore::detectDevice(const char* label)
* device. Doing otherwise results in undefined behavior. This function was
* intended for use during initial configuration, not routine loading of
* devices. These restrictions may be relaxed in the future if possible.
*
* Throws an exception if the hub device is not initialized.
*
* @param hubDeviceLabel the label for the device of type Hub
*/
std::vector<std::string> CMMCore::getInstalledDevices(const char* hubDeviceLabel) throw (CMMError)
{
if (isFeatureEnabled("StrictInitializationChecks")) {
if (getDeviceInitializationState(hubDeviceLabel) == DeviceInitializationState::Uninitialized) {
throw CMMError("Device " + ToQuotedString(hubDeviceLabel) + " is not yet initialized.");
}
}

std::shared_ptr<HubInstance> pHub =
deviceManager_->GetDeviceOfType<HubInstance>(hubDeviceLabel);

Expand Down

0 comments on commit b666b63

Please sign in to comment.