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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work

Browse source
This commit is contained in:
Gregory Diaz 2015-05-20 13:52:34 -07:00
commit b98120bcc1
14 changed files with 167 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -884,7 +884,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (gcodeViewWidget != null
&& gcodeViewWidget.LoadedGCode == null)
{
if (GCodeFile.FileTooBigToLoad(printItem.FileLocation))
// If we have finished loading the gcode and the source file exists but we don't have any loaded gcode it is because the loaded decided to not load it.
if (File.Exists(printItem.FileLocation))
{
SetProcessingMessage(string.Format(fileTooBigToLoad, printItem.Name));
}