From c47045a42e39ef42828cb87383f9f052fe5d979a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Feb 2018 11:47:17 +0100 Subject: [PATCH] Revert "CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished" This reverts commit 269b52487ed28e42daf7e2716117c4d3d27bc2fa. It was crashing Cura when pressing F5. The completion of this job should not be moved to Uranium because the job exists only in Cura. Contributes to issue CURA-4912. --- cura/CuraApplication.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 720fcab86b..90c7dbb75e 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1307,7 +1307,7 @@ class CuraApplication(QtApplication): if file_name: job = ReadMeshJob(file_name) job._node = node - job.finished.connect(node._reloadJobFinished) + job.finished.connect(self._reloadMeshFinished) job.start() else: Logger.log("w", "Unable to reload data because we don't have a filename.") @@ -1436,6 +1436,14 @@ class CuraApplication(QtApplication): fileLoaded = pyqtSignal(str) fileCompleted = pyqtSignal(str) + def _reloadMeshFinished(self, job): + # TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh! + mesh_data = job.getResult()[0].getMeshData() + if mesh_data: + job._node.setMeshData(mesh_data) + else: + Logger.log("w", "Could not find a mesh in reloaded node.") + def _openFile(self, filename): self.readLocalFile(QUrl.fromLocalFile(filename))