Improve error logging on out of memory. Improve plugin handling memory.

[cura.git] / Cura / util / sliceEngine.py

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 8d57910a7a6581ae8d6b0041e725eadac9549f3c..e6d7653c0589924e9000d1083afba8a2bdf63c66 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -385,25 +385,29 @@ class Engine(object):
                logThread.daemon = True
                logThread.start()
 
-               data = self._process.stdout.read(4096)
-               while len(data) > 0:
-                       self._result._gcodeData.write(data)
+               try:
                        data = self._process.stdout.read(4096)
-
-               returnCode = self._process.wait()
-               logThread.join()
-               if returnCode == 0:
-                       pluginError = pluginInfo.runPostProcessingPlugins(self._result)
-                       if pluginError is not None:
-                               print pluginError
-                               self._result.addLog(pluginError)
-                       self._result.setFinished(True)
-                       self._callback(1.0)
-               else:
-                       for line in self._result.getLog():
-                               print line
+                       while len(data) > 0:
+                               self._result._gcodeData.write(data)
+                               data = self._process.stdout.read(4096)
+
+                       returnCode = self._process.wait()
+                       logThread.join()
+                       if returnCode == 0:
+                               self._result.setFinished(True)
+                               plugin_error = pluginInfo.runPostProcessingPlugins(self._result)
+                               if plugin_error is not None:
+                                       print plugin_error
+                                       self._result.addLog(plugin_error)
+                               self._callback(1.0)
+                       else:
+                               for line in self._result.getLog():
+                                       print line
+                               self._callback(-1.0)
+                       self._process = None
+               except MemoryError:
+                       self._result.addLog("MemoryError")
                        self._callback(-1.0)
-               self._process = None
 
        def _watchStderr(self, stderr):
                objectNr = 0