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

Merge pull request #5343 from larsbrubaker/main

Browse source 
main
This commit is contained in:
Lars Brubaker 2022-06-11 13:51:12 -07:00 • committed by GitHub
commit d2d0c3e880
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControlLib/SetupWizard/HelpTreePanel.cs
View file

@ -380,7 +380,10 @@ namespace MatterHackers.MatterControl
{
var newNode = new HelpArticleTreeNode(helpArticle, theme);
nodesByPath[helpArticle.Path] = newNode;
if (!string.IsNullOrEmpty(helpArticle.Path))
{
nodesByPath[helpArticle.Path] = newNode;
}
if (helpArticle.Name == guideKey
|| (guideKey != null

2
MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
View file

@ -633,7 +633,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
mergeString += "+";
}
}
else if (holes.Any())
else if (holes?.Any() == true)
{
mergeString += ",";
}