From 5d1ba828bca1bdc9f100e58dc4a1079749894852 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 2 Dec 2016 15:15:34 +0100 Subject: [PATCH] Closing load project screen cancels loading of workspace CURA-1263 --- cura/Settings/MachineManager.py | 2 -- plugins/3MFReader/WorkspaceDialog.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index c54715bd6c..ea6a6123ff 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -53,8 +53,6 @@ class MachineManager(QObject): ExtruderManager.getInstance().activeExtruderChanged.connect(self.activeStackChanged) self.activeStackChanged.connect(self.activeStackValueChanged) - - Preferences.getInstance().addPreference("cura/active_machine", "") self._global_event_keys = set() diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 0055b209ff..cea935ba18 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -175,8 +175,8 @@ class WorkspaceDialog(QObject): @pyqtSlot() ## Used to notify the dialog so the lock can be released. def notifyClosed(self): - if self._result is None: - self._result = {} + self._result = {} + self._visible = False self._lock.release() def hide(self):