3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

In project loading dialog the CANCLE button did not work

Browse source 
CURA-4345
This commit is contained in:
alekseisasin 2017-09-25 14:32:02 +02:00
parent 4ddfb81897
commit d7ed8244ae
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/3MFReader/WorkspaceDialog.py
View file

@ -235,7 +235,7 @@ class WorkspaceDialog(QObject):
self._result["definition_changes"] = None self._result["definition_changes"] = None
# If the machine needs to be re-created, the definition_changes should also be re-created. # If the machine needs to be re-created, the definition_changes should also be re-created.
if self._result["machine"] == "new" and self._result["definition_changes"] is None: if "machine" in self._result and self._result["machine"] == "new" and self._result["definition_changes"] is None:
self._result["definition_changes"] = "new" self._result["definition_changes"] = "new"
if "material" in self._result and not self._has_material_conflict: if "material" in self._result and not self._has_material_conflict:
@ -267,7 +267,7 @@ class WorkspaceDialog(QObject):
@pyqtSlot() @pyqtSlot()
## Used to notify the dialog so the lock can be released. ## Used to notify the dialog so the lock can be released.
def notifyClosed(self): def notifyClosed(self):
self._result = {} self._result = {} # The result should be cleared before hide, because after it is released the main thread lock
self._visible = False self._visible = False
self._lock.release() self._lock.release()
@ -283,9 +283,10 @@ class WorkspaceDialog(QObject):
@pyqtSlot() @pyqtSlot()
def onCancelButtonClicked(self): def onCancelButtonClicked(self):
self._result = {}
self._view.hide() self._view.hide()
self.hide() self.hide()
self._result = {}
## Block thread until the dialog is closed. ## Block thread until the dialog is closed.
def waitForClose(self): def waitForClose(self):