From 41e94cd2a15c022a616798bcfafaf6583119d8e2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 1 Jun 2018 13:51:43 +0200 Subject: [PATCH] Fix merge problems from 3.4 --- cura/Settings/MachineManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 87c914bed3..3ee14ca85b 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1280,7 +1280,7 @@ class MachineManager(QObject): self._updateQualityWithMaterial() # See if we need to show the Discard or Keep changes screen - if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: + if self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() ## Find all container stacks that has the pair 'key = value' in its metadata and replaces the value with 'new_value' @@ -1335,7 +1335,7 @@ class MachineManager(QObject): self._updateQualityWithMaterial() # See if we need to show the Discard or Keep changes screen - if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: + if self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() @pyqtSlot(str, str) @@ -1354,7 +1354,7 @@ class MachineManager(QObject): self._updateQualityWithMaterial() # See if we need to show the Discard or Keep changes screen - if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: + if self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() @pyqtSlot(str)