From 7ee5a66c6448afef8c99d9338707c7454e7da870 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 12 May 2017 16:32:00 +0200 Subject: [PATCH] CuraContainerStack now overrides getBottom, so it always returns a definition --- cura/Settings/CuraContainerStack.py | 4 ++++ cura/Settings/MachineManager.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 6cffa6030b..4c5b7b08a0 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -254,6 +254,10 @@ class CuraContainerStack(ContainerStack): def definition(self) -> DefinitionContainer: return self._containers[_ContainerIndexes.Definition] + @override(ContainerStack) + def getBottom(self) -> "DefinitionContainer": + return self.definition + ## Check whether the specified setting has a 'user' value. # # A user value here is defined as the setting having a value in either diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 57cc296bdf..98526f00a5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -33,6 +33,7 @@ from typing import TYPE_CHECKING, Optional if TYPE_CHECKING: from UM.Settings.DefinitionContainer import DefinitionContainer + from cura.Settings.GlobalStack import GlobalStack import os @@ -42,7 +43,7 @@ class MachineManager(QObject): super().__init__(parent) self._active_container_stack = None # type: ContainerStack - self._global_container_stack = None # type: ContainerStack + self._global_container_stack = None # type: GlobalStack self._error_check_timer = QTimer() self._error_check_timer.setInterval(250)