3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Closing load project screen cancels loading of workspace

Browse source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-12-02 15:15:34 +01:00
parent a5c38e0591
commit 5d1ba828bc
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/MachineManager.py
View file

@ -53,8 +53,6 @@ class MachineManager(QObject):
ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeStackChanged) ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeStackChanged)
self.activeStackChanged.connect(self.activeStackValueChanged) self.activeStackChanged.connect(self.activeStackValueChanged)
Preferences.getInstance().addPreference("cura/active_machine", "") Preferences.getInstance().addPreference("cura/active_machine", "")
self._global_event_keys = set() self._global_event_keys = set()

4
plugins/3MFReader/WorkspaceDialog.py
View file

@ -175,8 +175,8 @@ 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):
if self._result is None: self._result = {}
self._result = {} self._visible = False
self._lock.release() self._lock.release()
def hide(self): def hide(self):