nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only pop user overrides if we're switching presets

Browse source 
- Issue MatterHackers/MCCentral#1076
Selecting the current preset incorrectly restores user overrides
This commit is contained in:
John Lewin 2017-01-11 07:50:14 -08:00
parent b863a07405
commit 69c53977d3
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SlicerConfiguration/SettingsControlSelectors.cs
View file

@ -230,11 +230,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (layerType == NamedSettingsLayers.Material)
{
// Restore deactivated user overrides by iterating the Material preset we're coming off of
RestoreConflictingUserOverrides(activeSettings, activeSettings.MaterialLayer);
if (activeSettings.GetMaterialPresetKey(extruderIndex) != item.Value)
{
// Restore deactivated user overrides by iterating the Material preset we're coming off of
RestoreConflictingUserOverrides(activeSettings, activeSettings.MaterialLayer);
activeSettings.SetMaterialPreset(extruderIndex, item.Value);
// Deactivate conflicting user overrides by iterating the Material preset we've just switched to
@ -243,11 +243,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
else if (layerType == NamedSettingsLayers.Quality)
{
// Restore deactivated user overrides by iterating the Quality preset we're coming off of
RestoreConflictingUserOverrides(activeSettings, activeSettings.QualityLayer);
if (activeSettings.ActiveQualityKey != item.Value)
{
// Restore deactivated user overrides by iterating the Quality preset we're coming off of
RestoreConflictingUserOverrides(activeSettings, activeSettings.QualityLayer);
activeSettings.ActiveQualityKey = item.Value;
// Deactivate conflicting user overrides by iterating the Quality preset we've just switched to