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

Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes

Browse source
This commit is contained in:
fieldOfView 2017-04-24 13:11:10 +02:00
parent fab0fa1dde
commit 3e9fdb5db1
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/MachineSettingsAction/MachineSettingsAction.py
View file

@ -7,6 +7,7 @@ from UM.FlameProfiler import pyqtSlot
from cura.MachineAction import MachineAction from cura.MachineAction import MachineAction
from UM.Application import Application from UM.Application import Application
from UM.Preferences import Preferences
from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.InstanceContainer import InstanceContainer
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.DefinitionContainer import DefinitionContainer
@ -209,12 +210,21 @@ class MachineSettingsAction(MachineAction):
extruder_manager.setActiveExtruderIndex(-1); extruder_manager.setActiveExtruderIndex(-1);
# Restore material and variant on global stack # Restore material and variant on global stack
# MachineManager._onGlobalContainerChanged removes the global material and vaiant of multiextruder machines # MachineManager._onGlobalContainerChanged removes the global material and variant of multiextruder machines
if extruder_material_id or extruder_variant_id:
# Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes
# The dialog is not relevant here, since we're restoring the previous situation as good as possible
preferences = Preferences.getInstance()
choice_on_profile_override = preferences.getValue("cura/choice_on_profile_override")
preferences.setValue("cura/choice_on_profile_override", "always_keep")
if extruder_material_id: if extruder_material_id:
machine_manager.setActiveMaterial(extruder_material_id); machine_manager.setActiveMaterial(extruder_material_id);
if extruder_variant_id: if extruder_variant_id:
machine_manager.setActiveVariant(extruder_variant_id); machine_manager.setActiveVariant(extruder_variant_id);
preferences.setValue("cura/choice_on_profile_override", choice_on_profile_override)
@pyqtSlot() @pyqtSlot()
def forceUpdate(self): def forceUpdate(self):