From 6d9a57d96b0cfd7aa19fbd24269ed202fbe312a4 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 25 Oct 2018 12:36:03 -0700 Subject: [PATCH] On theme change, prevent theme change until reload completes - Issue MatterHackers/MCCentral#4381 --- .../ApplicationSettings/ThemePreviewButton.cs | 3 +++ MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs b/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs index 84a7e51d0..22ac22cd7 100644 --- a/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs +++ b/MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs @@ -126,6 +126,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage { // Activate the theme themeColorPanel.SetThemeColor(this.ThemeSet, primaryAccentColor, this.Mode); + + // Disable further theme clicks until reload completes + themeColorPanel.Enabled = false; }; this.AddChild(overlay); diff --git a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs index 750d3adda..c0467e49d 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs @@ -627,7 +627,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; }); } - } private static void CopyPlateToPrinter(BedConfig sceneContext, PrinterConfig printer)