Skip to content

Commit

Permalink
Merge branch 'hydro-devel' of https://github.com/robotics-in-concert/…
Browse files Browse the repository at this point in the history
…rocon_qt_gui into hydro-devel
  • Loading branch information
stonier committed May 15, 2014
2 parents 6e9d30c + 1f67bec commit 550bfdc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion concert_qt_teleop/src/concert_qt_teleop/teleop_app_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def _release_teleop(self, rocon_uri):
request.rocon_uri = rocon_uri
request.release = True
self.captured_teleop_rocon_uri = rocon_uri
msg_id = self.capture_teleop(request, timeout=rospy.Duration(self.capture_timeout), callback=self._release_callback, error_callback=self.error_callback)
msg_id = self.capture_teleop(request, timeout=rospy.Duration(self._capture_timeout), callback=self._release_callback, error_callback=self.error_callback)
self.service_pair_msg_q.append(msg_id)

def _capture_callback(self, msg_id, msg):
Expand Down

0 comments on commit 550bfdc

Please sign in to comment.