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

Only recover MaterialSettingsKeys if ActiveMaterialKey unset

Browse source
This commit is contained in:
jlewin 2019-03-06 14:05:02 -08:00
parent f3620aa29c
commit 7a893817a7
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControl.Printing/Settings/PrinterSettings.cs
View file

@ -1037,8 +1037,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// Deserialize using default serializer
var settings = jObject.ToObject<PrinterSettings>();
// Look for and import retired MaterialSettingsKeys property
if (jObject["MaterialSettingsKeys"] is JArray materialSettingsKeys
// Look for and import retired MaterialSettingsKeys property if ActiveMaterialKey unset
if (string.IsNullOrWhiteSpace(settings.ActiveMaterialKey)
&& jObject["MaterialSettingsKeys"] is JArray materialSettingsKeys
&& materialSettingsKeys.Count > 0)
{
string firstValue = materialSettingsKeys[0].Value<string>();