fix(type): fix conflict

2019-02-28 15:04:21 +08:00
parent c24e2806b3 c35d338248
commit 559a812c65
10 changed files with 230 additions and 72 deletions
--- a/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc
+++ b/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc
@@ -650,7 +650,7 @@ class ROSWrapperNodelet : public nodelet::Nodelet {
          is_published_[stream] = false;
        }
        api_->Start(Source::VIDEO_STREAMING);
-      } else if (sum_c > sum) {
+      } else {
        if ((camera_publishers_[Stream::LEFT].getNumSubscribers() > 0 ||
            mono_publishers_[Stream::LEFT].getNumSubscribers() > 0) &&
            !is_published_[Stream::LEFT]) {