From: Brad Pitcher <bradpitcher@gmail.com>
Date: Mon, 20 Oct 2014 00:09:10 +0000 (-0700)
Subject: avoid TypeError when reading the active io
X-Git-Tag: 14.10-RC5~16^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6ecd0bb196cb1132a1f8c7a94cbc15402db873aa;p=cura.git

avoid TypeError when reading the active io
---

diff --git a/Cura/util/bigDataStorage.py b/Cura/util/bigDataStorage.py
index 9150455c..970a9ed7 100644
--- a/Cura/util/bigDataStorage.py
+++ b/Cura/util/bigDataStorage.py
@@ -21,14 +21,17 @@ class BigDataStorage(object):
 		self._active.seek(0)
 		self._read_index = 0
 
+	def activeRead(self, size=None):
+		return self._active.read(size) if size != None else self._active.read()
+
 	def read(self, size=None):
-		ret = self._active.read(size)
+		ret = self.activeRead(size)
 		if ret == '':
 			if self._read_index + 1 < len(self._list):
 				self._read_index += 1
 				self._active = self._list[self._read_index]
 				self._active.seek(0)
-				ret = self._active.read(size)
+				ret = self.activeRead(size)
 		return ret
 
 	def replaceAtStart(self, key, value):
@@ -78,4 +81,4 @@ class BigDataStorage(object):
 		for item in self._list:
 			clone._list.append(StringIO.StringIO(item.getvalue()))
 		clone._active = clone._list[-1]
-		return clone
\ No newline at end of file
+		return clone