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

code that handles null organizer settings data

Browse source
This commit is contained in:
Gregory Diaz 2014-12-16 11:07:44 -08:00
parent 3c41775a54
commit e1f4c818dd
4 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SlicerConfiguration/SliceSettingsOrganizer.cs
View file

@ -268,8 +268,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return settingData;
}
}
throw new Exception("You must not have a layout for a setting that is not in the Properties.txt");
return null;
//GD-Turning into non-fatal exception 12/12/14
//throw new Exception("You must not have a layout for a setting that is not in the Properties.txt");
}
void LoadAndParseSettingsFiles()
@ -310,7 +311,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
case 8:
subGroupToAddTo.SettingDataList.Add(GetSettingsData(line.Replace('"', ' ').Trim()));
OrganizerSettingsData data = GetSettingsData(line.Replace('"', ' ').Trim());
if (data != null)
{
subGroupToAddTo.SettingDataList.Add(data);
}
break;
default: