From 3db2524476bfb79f7ca4a6086815d6fb12f062d9 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Thu, 17 Jan 2019 12:19:28 -0500 Subject: [PATCH] Dummy vehicle doesn't implement the camera API --- src/FlightDisplay/VideoManager.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FlightDisplay/VideoManager.cc b/src/FlightDisplay/VideoManager.cc index dbd0082fa3..3f2491157c 100644 --- a/src/FlightDisplay/VideoManager.cc +++ b/src/FlightDisplay/VideoManager.cc @@ -87,7 +87,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox) //----------------------------------------------------------------------------- double VideoManager::aspectRatio() { - if(_activeVehicle) { + if(_activeVehicle && _activeVehicle->dynamicCameras()) { QGCVideoStreamInfo* pInfo = _activeVehicle->dynamicCameras()->currentStreamInstance(); if(pInfo) { return pInfo->aspectRatio(); @@ -100,7 +100,7 @@ double VideoManager::aspectRatio() bool VideoManager::autoStreamConfigured() { - if(_activeVehicle) { + if(_activeVehicle && _activeVehicle->dynamicCameras()) { QGCVideoStreamInfo* pInfo = _activeVehicle->dynamicCameras()->currentStreamInstance(); if(pInfo) { return !pInfo->uri().isEmpty(); @@ -203,7 +203,7 @@ VideoManager::_updateSettings() if(!_videoSettings || !_videoReceiver) return; //-- Auto discovery - if(_activeVehicle) { + if(_activeVehicle && _activeVehicle->dynamicCameras()) { QGCVideoStreamInfo* pInfo = _activeVehicle->dynamicCameras()->currentStreamInstance(); if(pInfo) { switch(pInfo->type()) { -- GitLab