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

Merge pull request #1504 from larsbrubaker/1.6.0

Browse source 
Fixed a bug with wipe towers
This commit is contained in:
Lars Brubaker 2016-10-18 11:55:57 -07:00 • committed by GitHub
commit b9249c2c3f
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -134,12 +134,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
ActiveTheme.Instance = ActiveTheme.GetThemeColors(activeThemeName);
ActiveTheme.ResumeEvents();
}
else
{
//If the active printer has no theme we set it to the current theme color
ActiveSliceSettings.Instance.SetValue(SettingsKey.active_theme_name, ActiveTheme.Instance.Name);
}
}
}
}

3
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -444,6 +444,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
printerSettings.UserLayer[SettingsKey.printer_name.ToString()] = printerName;
//If the active printer has no theme we set it to the current theme color
printerSettings.UserLayer[SettingsKey.active_theme_name] = ActiveTheme.Instance.Name;
// Import named macros as defined in the following printers: (Airwolf Axiom, HD, HD-R, HD2x, HDL, HDx, Me3D Me2, Robo R1[+])
var classicDefaultMacros = printerSettings.GetValue("default_macros");
if (!string.IsNullOrEmpty(classicDefaultMacros))

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit df38a59e274103067d99da3542cb2a95c85ea1c2
Subproject commit d033df84d755d53880e30eef409ba9fe4c5b4b0e