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

Skip loading GCode output if slicing failed

Browse source 
- Issue MatterHackers/MCCentral#2758
"Loading GCode" appears after canceling slicing
This commit is contained in:
John Lewin 2018-02-01 21:42:09 -08:00
parent 6d93a2716d
commit 02abe42da2
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SlicerConfiguration/Slicer.cs
View file

@ -245,8 +245,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return filePath;
}
public static Task SliceFile(string sourceFile, string gcodeFilePath, PrinterConfig printer, IProgress<ProgressStatus> progressReporter, CancellationToken cancellationToken)
public static Task<bool> SliceFile(string sourceFile, string gcodeFilePath, PrinterConfig printer, IProgress<ProgressStatus> progressReporter, CancellationToken cancellationToken)
{
bool slicingSucceeded = true;
string mergeRules = "";
string[] stlFileLocations = GetStlFileLocations(sourceFile, ref mergeRules, printer, progressReporter, cancellationToken);
@ -364,6 +366,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
slicerProcess.WaitForExit();
}
slicingSucceeded = !forcedExit;
}
}
@ -414,7 +418,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
return Task.CompletedTask;
return Task.FromResult(slicingSucceeded);
}
private static bool HasCompletedSuccessfully(string gcodeFilePath)