From 340e286c330531ca8e1b887a94a880ac7e6ffe70 Mon Sep 17 00:00:00 2001 From: Rodney Date: May 10 2021 23:26:53 +0000 Subject: Merge pull request #3945 from shun-iwasawa/camera_capture_initial_connection Camera capture : Connect to any camera on start --- diff --git a/toonz/sources/toonz/penciltestpopup.cpp b/toonz/sources/toonz/penciltestpopup.cpp index 69f1222..53deba3 100644 --- a/toonz/sources/toonz/penciltestpopup.cpp +++ b/toonz/sources/toonz/penciltestpopup.cpp @@ -1610,10 +1610,21 @@ PencilTestPopup::PencilTestPopup() int startupCamIndex = m_cameraListCombo->findText( QString::fromStdString(CamCapCameraName.getValue())); + // if previous camera is not found, then try to activate the connected default + // camera + if (startupCamIndex <= 0 && !QCameraInfo::defaultCamera().isNull()) { + startupCamIndex = + m_cameraListCombo->findText(QCameraInfo::defaultCamera().description()); + } if (startupCamIndex > 0) { m_cameraListCombo->setCurrentIndex(startupCamIndex); onCameraListComboActivated(startupCamIndex); } + // just in case, try to activate any connected camera + else if (m_cameraListCombo->count() >= 2) { + m_cameraListCombo->setCurrentIndex(1); + onCameraListComboActivated(1); + } QString resStr = QString::fromStdString(CamCapCameraResolution.getValue()); if (m_currentCamera && !resStr.isEmpty()) {