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

Making STL and MeshFileIo take a cancelation token

Browse source
This commit is contained in:
Lars Brubaker 2018-01-31 09:50:23 -08:00
parent d19ada973e
commit cefd99b361
5 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Library/Export/MeshExport.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.Library.Export
{
// If the content is an IObject3D, the we need to load it and MeshFileIO save to the target path
var content = await contentItem.GetContent(null);
return MeshFileIo.Save(content, filePathToSave);
return MeshFileIo.Save(content, filePathToSave, CancellationToken.None);
}
else if (source is ILibraryContentStream streamContent)
{
@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.Library.Export
using (var result = await streamContent.GetContentStream(null))
{
IObject3D item = Object3D.Load(result.Stream, Path.GetExtension(streamContent.FileName), CancellationToken.None);
return MeshFileIo.Save(item, filePathToSave);
return MeshFileIo.Save(item, filePathToSave, CancellationToken.None);
}
}
}