From da203364bacbd8389e94c8fa476644ba1ba4dcd6 Mon Sep 17 00:00:00 2001 From: Matthew Territo Date: Wed, 6 Jul 2016 12:02:01 -0600 Subject: [PATCH] Rollback pointer changes to _synchronizationBuffer. Was causing segfault on mutex locks during launch. --- include/openspace/util/syncbuffer.h | 2 +- src/util/syncbuffer.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h index 3bf6b2a029..7f97952687 100644 --- a/include/openspace/util/syncbuffer.h +++ b/include/openspace/util/syncbuffer.h @@ -107,7 +107,7 @@ private: size_t _encodeOffset; size_t _decodeOffset; std::vector _dataStream; - sgct::SharedVector* _synchronizationBuffer; + sgct::SharedVector _synchronizationBuffer; }; } // namespace openspace diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp index 0b11d3a6cf..555cf875d4 100644 --- a/src/util/syncbuffer.cpp +++ b/src/util/syncbuffer.cpp @@ -37,15 +37,15 @@ SyncBuffer::SyncBuffer(size_t n) } void SyncBuffer::write() { - _synchronizationBuffer->setVal(_dataStream); - sgct::SharedData::instance()->writeVector(_synchronizationBuffer); + _synchronizationBuffer.setVal(_dataStream); + sgct::SharedData::instance()->writeVector(&_synchronizationBuffer); _encodeOffset = 0; _decodeOffset = 0; } void SyncBuffer::read() { - sgct::SharedData::instance()->readVector(_synchronizationBuffer); - _dataStream = std::move(_synchronizationBuffer->getVal()); + sgct::SharedData::instance()->readVector(&_synchronizationBuffer); + _dataStream = std::move(_synchronizationBuffer.getVal()); _encodeOffset = 0; _decodeOffset = 0; }