Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop

This commit is contained in:
kalman 2019-02-22 20:12:18 +08:00
commit 2a3580191b

View File

@ -644,7 +644,7 @@ class ROSWrapperNodelet : public nodelet::Nodelet {
is_published_[stream] = false; is_published_[stream] = false;
} }
api_->Start(Source::VIDEO_STREAMING); api_->Start(Source::VIDEO_STREAMING);
} else { } else if (sum_c > sum) {
if ((camera_publishers_[Stream::LEFT].getNumSubscribers() > 0 || if ((camera_publishers_[Stream::LEFT].getNumSubscribers() > 0 ||
mono_publishers_[Stream::LEFT].getNumSubscribers() > 0) && mono_publishers_[Stream::LEFT].getNumSubscribers() > 0) &&
!is_published_[Stream::LEFT]) { !is_published_[Stream::LEFT]) {