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

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

Browse source
This commit is contained in:
Kevin Pope 2014-03-03 16:32:21 -08:00
commit 82740d3222
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PartPreviewWindow/GcodeViewBasic.cs
View file

@ -145,7 +145,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// we only hook these up to make sure we can regenerate the gcode when we want
printItem.SlicingOutputMessage += sliceItem_SlicingOutputMessage;
printItem.Done += new EventHandler(sliceItem_Done);
printItem.Done += sliceItem_Done;
}
centerPartPreviewAndControls.AddChild(gcodeDispalyWidget);
@ -622,6 +622,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
void sliceItem_Done(object sender, EventArgs e)
{
// We can add this while we have it open (when we are done loading).
// So we need to make sure we only have it added once. This will be ok to run when
// not added or when added and will ensure we only have one hook.
printItem.SlicingOutputMessage -= sliceItem_SlicingOutputMessage;
printItem.Done -= sliceItem_Done;
UiThread.RunOnIdle(CreateAndAddChildren);
startedSliceFromGenerateButton = false;
}

1
PrintQueue/ExportToFolderProcess.cs
View file

@ -101,6 +101,7 @@ namespace MatterHackers.MatterControl.PrintQueue
PrintItemWrapper sliceItem = (PrintItemWrapper)sender;
sliceItem.Done -= new EventHandler(sliceItem_Done);
sliceItem.SlicingOutputMessage -= printItemWrapper_SlicingOutputMessage;
savedGCodeFileNames.Add(sliceItem.GCodePathAndFileName);
itemCountBeingWorkedOn++;

1
PrintQueue/PrintQueueItem.cs
View file

@ -279,6 +279,7 @@ namespace MatterHackers.MatterControl.PrintQueue
public override void OnClosed(EventArgs e)
{
PrintItemWrapper.SlicingOutputMessage -= PrintItem_SlicingOutputMessage;
if (unregisterEvents != null)
{
unregisterEvents(this, null);