Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert pull request #476 #477

Merged
merged 1 commit into from
Jul 5, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading