diff options
Diffstat (limited to 'src/engine/EventBuffer.cpp')
| -rw-r--r-- | src/engine/EventBuffer.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp index f8e3a5de..7110ccc2 100644 --- a/src/engine/EventBuffer.cpp +++ b/src/engine/EventBuffer.cpp @@ -51,16 +51,10 @@ bool EventBuffer::join(Buffer* buf) { EventBuffer* ebuf = dynamic_cast<EventBuffer*>(buf); - if (ebuf) { - _buf = ebuf->_local_buf; - _joined_buf = ebuf; - _iter = ebuf->_iter; - _iter.buf = _buf->data(); + if (!ebuf) return false; - } else { - return false; - } + _buf = ebuf->_local_buf; _joined_buf = ebuf; return true; @@ -72,7 +66,6 @@ EventBuffer::unjoin() { _joined_buf = NULL; _buf = _local_buf; - reset(_this_nframes); } |