From 21f17527249c82a34f939e7bb7d90124e718bfaf Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 20 May 2020 13:51:36 -0700 Subject: [PATCH] Made print button disabled while printing Calculate HasTransparency correctly --- MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs | 3 ++- .../PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs | 3 ++- Submodules/agg-sharp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs index 3dc31a4a5..796e9b3a5 100644 --- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs +++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs @@ -345,7 +345,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } else { - if (ApplicationController.Instance.Extensions.GetEditorsForType(item.GetType())?.FirstOrDefault() is IObject3DEditor editor) + if (item != null + && ApplicationController.Instance.Extensions.GetEditorsForType(item.GetType())?.FirstOrDefault() is IObject3DEditor editor) { ShowObjectEditor((editor, item, item.Name), selectedItem); } diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs index 1fa12a2eb..f56396dcd 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs @@ -164,7 +164,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var errors = printer.Validate(); // Enable print option when no validation Errors exists - var printEnabled = !errors.Any(err => err.ErrorLevel == ValidationErrorLevel.Error); + var printingOrPause = printer.Connection.Printing || printer.Connection.Paused; + var printEnabled = !printingOrPause && !errors.Any(err => err.ErrorLevel == ValidationErrorLevel.Error); var startPrintButton = new TextButton("Start Print".Localize(), menuTheme) { diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 1f42aeef0..24cddc85a 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 1f42aeef034a4dfdb8e60bcce88e1050f0a4f6d7 +Subproject commit 24cddc85a8579910692cf84f88723bb21edb220c