[TorqueController] Fix merge miss in timestamp

snozawa · Dec 26, 2015 · 59418ed · 59418ed
1 parent 6d47018
commit 59418ed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rtc/TorqueController/TorqueController.cpp b/rtc/TorqueController/TorqueController.cpp
@@ -315,7 +315,7 @@ RTC::ReturnCode_t TorqueController::onExecute(RTC::UniqueId ec_id)
  m_qRefOut.data[i] = m_qRefIn.data[i];
  }
  }
- m_qRefOut.tm = tm;
+ m_qRefOut.tm = m_qRefIn.tm;
  m_qRefOutOut.write();
  } else {
  if (isDebug()) {