Commit 4d851c94 authored by Gus Grubba's avatar Gus Grubba

Make sure video streaming is running before accessing the video receiver.

parent 6af7e8f2
...@@ -364,10 +364,12 @@ QGCCameraControl::takePhoto() ...@@ -364,10 +364,12 @@ QGCCameraControl::takePhoto()
_setPhotoStatus(PHOTO_CAPTURE_IN_PROGRESS); _setPhotoStatus(PHOTO_CAPTURE_IN_PROGRESS);
_captureInfoRetries = 0; _captureInfoRetries = 0;
//-- Capture local image as well //-- Capture local image as well
QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo"); if(qgcApp()->toolbox()->videoManager()->videoReceiver()) {
QDir().mkpath(photoPath); QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo");
photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg"; QDir().mkpath(photoPath);
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath); photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg";
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath);
}
return true; return true;
} }
} }
...@@ -1471,10 +1473,12 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap ...@@ -1471,10 +1473,12 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap
//-- Time Lapse //-- Time Lapse
if(photoStatus() == PHOTO_CAPTURE_INTERVAL_IDLE || photoStatus() == PHOTO_CAPTURE_INTERVAL_IN_PROGRESS) { if(photoStatus() == PHOTO_CAPTURE_INTERVAL_IDLE || photoStatus() == PHOTO_CAPTURE_INTERVAL_IN_PROGRESS) {
//-- Capture local image as well //-- Capture local image as well
QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo"); if(qgcApp()->toolbox()->videoManager()->videoReceiver()) {
QDir().mkpath(photoPath); QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo");
photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg"; QDir().mkpath(photoPath);
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath); photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg";
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath);
}
} }
} }
......
...@@ -1640,9 +1640,11 @@ void Vehicle::_updateArmed(bool armed) ...@@ -1640,9 +1640,11 @@ void Vehicle::_updateArmed(bool armed)
} else { } else {
_mapTrajectoryStop(); _mapTrajectoryStop();
// Also handle Video Streaming // Also handle Video Streaming
if(_settingsManager->videoSettings()->disableWhenDisarmed()->rawValue().toBool()) { if(qgcApp()->toolbox()->videoManager()->videoReceiver()) {
_settingsManager->videoSettings()->streamEnabled()->setRawValue(false); if(_settingsManager->videoSettings()->disableWhenDisarmed()->rawValue().toBool()) {
qgcApp()->toolbox()->videoManager()->videoReceiver()->stop(); _settingsManager->videoSettings()->streamEnabled()->setRawValue(false);
qgcApp()->toolbox()->videoManager()->videoReceiver()->stop();
}
} }
} }
} }
...@@ -1654,8 +1656,8 @@ void Vehicle::_handlePing(LinkInterface* link, mavlink_message_t& message) ...@@ -1654,8 +1656,8 @@ void Vehicle::_handlePing(LinkInterface* link, mavlink_message_t& message)
mavlink_message_t msg; mavlink_message_t msg;
mavlink_msg_ping_decode(&message, &ping); mavlink_msg_ping_decode(&message, &ping);
mavlink_msg_ping_pack_chan(_mavlink->getSystemId(), mavlink_msg_ping_pack_chan(static_cast<uint8_t>(_mavlink->getSystemId()),
_mavlink->getComponentId(), static_cast<uint8_t>(_mavlink->getComponentId()),
priorityLink()->mavlinkChannel(), priorityLink()->mavlinkChannel(),
&msg, &msg,
ping.time_usec, ping.time_usec,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment