Merged in changes from fuerte_dev branch that fixed issue with stoppi…

…ng a joint trajectory in motion.
OrebroUniversity · Mar 26, 2013 · 519ab4e · 519ab4e
1 parent 4911f21
commit 519ab4e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/industrial_robot_client/src/joint_trajectory_streamer.cpp b/industrial_robot_client/src/joint_trajectory_streamer.cpp
@@ -78,7 +78,9 @@ void JointTrajectoryStreamer::jointTrajectoryCB(const trajectory_msgs::JointTraj
     else
       ROS_ERROR("Trajectory splicing not yet implemented, stopping current motion.");
 
+	this->mutex_.lock();
     trajectoryStop();
+	this->mutex_.unlock();
     return;
   }