From cc5e520be52fd7ba0c45ec7076fa4af992e2d64c Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Thu, 7 Jul 2016 12:00:49 -0600
Subject: [PATCH] Rollback to Alex's original changes to _synchronizationBuffer

Allocated _synchronizationBuffer in SyncBuffer initialization instead to fix.
---
 include/openspace/util/syncbuffer.h | 2 +-
 src/util/syncbuffer.cpp             | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h
index 7f97952687..3bf6b2a029 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<char> _dataStream;
-    sgct::SharedVector<char> _synchronizationBuffer;
+    sgct::SharedVector<char>* _synchronizationBuffer;
 };
 
 } // namespace openspace
diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp
index 555cf875d4..f1a68c39df 100644
--- a/src/util/syncbuffer.cpp
+++ b/src/util/syncbuffer.cpp
@@ -34,18 +34,19 @@ SyncBuffer::SyncBuffer(size_t n)
     , _decodeOffset(0)
 {
     _dataStream.resize(_n);
+    _synchronizationBuffer = new sgct::SharedVector<char>();
 }
 
 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;
 }