Merge branch '#111-px4io-integrated-mixing' into fixedwing_io_mixing

This commit is contained in:
Lorenz Meier
2012-12-30 14:03:33 +01:00
+4 -4
View File
@@ -235,11 +235,11 @@ mixer_handle_text(const void *buffer, size_t length)
if (resid != mixer_text_length) { if (resid != mixer_text_length) {
debug("used %u", mixer_text_length - resid); debug("used %u", mixer_text_length - resid);
/* copy any leftover text to the base of the buffer for re-use */ // copy any leftover text to the base of the buffer for re-use
if (resid > 0) // if (resid > 0)
memcpy(&mixer_text[0], &mixer_text[mixer_text_length - resid], resid); // memcpy(&mixer_text[0], &mixer_text[mixer_text_length - resid], resid);
mixer_text_length = resid; // mixer_text_length = resid;
} }
break; break;