Changing close to not take any params

changing CloseEventArgs to EventArgs

AboutPage/UpdateControlView.cs

@@ -118,7 +118,7 @@ namespace MatterHackers.MatterControl
 			this.UpdateStatusChanged(null, null);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

ActionBar/PrinterSelector.cs

@@ -154,7 +154,7 @@ namespace MatterHackers.MatterControl
 			return imageBuffer;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

ActionBar/TemperatureWidgetBase.cs

@@ -148,7 +148,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			base.OnLoad(args);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs

@@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs

@@ -106,7 +106,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			base.OnLoad(args);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			this.DialogWindow.KeyDown -= TopWindowKeyDown;
 			base.OnClosed(e);

ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs

@@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			this.probePosition = probePosition;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs

@@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			this.autoAdvance = autoAdvance;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs

@@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			base.OnLoad(args);
 		}
 
-		private void WizardWindow_Closed(object sender, ClosedEventArgs e)
+		private void WizardWindow_Closed(object sender, EventArgs e)
 		{
 			// Make sure when the wizard closes we turn off the bed heating
 			printer.Connection.TurnOffBedAndExtruders(TurnOff.AfterDelay);

ConfigurationPage/RunningMacroPage.cs

@@ -74,6 +74,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 				okButton.Name = "Continue Button";
 				okButton.Click += (s, e) =>
 				{
+					ContinueToNextPage = true;
 					printer.Connection.MacroContinue();
 				};
 
@@ -136,9 +137,9 @@ namespace MatterHackers.MatterControl.PrinterControls
 			public string markdown = "";
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
-			if(e.OsEvent)
+			if (!ContinueToNextPage)
 			{
 				printer.Connection.MacroCancel();
 			}
@@ -152,6 +153,10 @@ namespace MatterHackers.MatterControl.PrinterControls
 			if(runningInterval != null)
 			{
 				runningInterval.Continue = !HasBeenClosed && progressBar.RatioComplete < 1;
+				if(!runningInterval.Continue)
+				{
+					ContinueToNextPage = true;
+				}
 			}
 			progressBar.Visible = true;
 			long timeSinceStartMs = UiThread.CurrentTimerMs - startTimeMs;
@@ -161,6 +166,9 @@ namespace MatterHackers.MatterControl.PrinterControls
 		}
 
 		double startingTemp;
+
+		public bool ContinueToNextPage { get; set; } = false;
+
 		private void LookForTempRequest(object sender, EventArgs e)
 		{
 			var stringEvent = e as StringEventArgs;

ControlElements/StyledMessageBoxWindow.cs

@@ -145,7 +145,7 @@ namespace MatterHackers.MatterControl
 				}
 			}
 
-			public override void OnClosed(ClosedEventArgs e)
+			public override void OnClosed(EventArgs e)
 			{
 				if (!haveResponded)
 				{

CustomWidgets/DockingTabControl.cs

@@ -464,7 +464,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
 			widgetTodockTo.Closed += widgetRelativeTo_Closed;
 		}
 
-		private void widgetRelativeTo_Closed(object sender, ClosedEventArgs e)
+		private void widgetRelativeTo_Closed(object sender, EventArgs e)
 		{
 			// If the owning widget closed, so should we
 			popupWidget.CloseMenu();

CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs

@@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
 			UiThread.RunOnIdle(UpdateTemperatures);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 		}

EeProm/EePromMarlinWindow.cs

@@ -353,7 +353,7 @@ namespace MatterHackers.MatterControl.EeProm
 			return currentTabIndex++;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

EeProm/EePromRepetierWindow.cs

@@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.EeProm
 			}, ref unregisterEvents);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);
@@ -240,7 +240,7 @@ namespace MatterHackers.MatterControl.EeProm
 			});
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			if (currentEePromSettings != null)
 			{

Library/Widgets/ListView/ListView.cs

@@ -488,7 +488,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
 			ScrollPosition += new Vector2(0, scrollAmount * direction);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			if (this.LibraryContext != null)
 			{

Library/Widgets/PrintLibraryWidget.cs

@@ -856,7 +856,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
 			libraryView.MenuActions = menuActions;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			if (libraryView?.ActiveContainer != null)
 			{

PartPreviewWindow/GCode2DWidget.cs

@@ -301,7 +301,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 

PartPreviewWindow/GCode3DWidget.cs

@@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			printer.Bed.RendererOptions.PropertyChanged -= RendererOptions_PropertyChanged;
 			printer.Bed.LoadedGCodeChanged -= Bed_LoadedGCodeChanged;

PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs

@@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			return textWidget;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PartPreviewWindow/MaterialControls.cs

@@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			scene.SelectionChanged -= Scene_SelectionChanged;
 			base.OnClosed(e);

PartPreviewWindow/PartPreviewContent.cs

@@ -334,7 +334,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			return partTab;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PartPreviewWindow/PrinterTabPage.cs

@@ -379,7 +379,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(null, null);
 

PartPreviewWindow/RunningTaskRow.cs

@@ -186,7 +186,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			detailsPanel.Visible = isExpanded;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			base.OnClosed(e);
 			taskDetails.ProgressChanged -= TaskDetails_ProgressChanged;

PartPreviewWindow/SliceLayerSelector.cs

@@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			set => layerScrollbar.Value = value;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			sceneContext.ActiveLayerChanged -= SetPositionAndValue;
 			layerSlider.MouseEnter -= SetPositionAndValue;
@@ -210,7 +210,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				}
 			}
 
-			public override void OnClosed(ClosedEventArgs e)
+			public override void OnClosed(EventArgs e)
 			{
 				base.OnClosed(e);
 

PartPreviewWindow/StartPage/ExplorerBar.cs

@@ -276,7 +276,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 

PartPreviewWindow/SystemWindowExtension.cs

@@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				}
 			}
 
-			void anchor_Closed(object sender, ClosedEventArgs e)
+			void anchor_Closed(object sender, EventArgs e)
 			{
 				// If the owning widget closed, so should we
 				CloseMenu();

PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs

@@ -101,7 +101,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			SetButtonStates();
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs

@@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			ref unregisterEvents);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs

@@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			base.AddChild(childToAdd, indexInChildrenList);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs

@@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			this.SetVisibleStates();
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PartPreviewWindow/View3D/PrinterBar/SliceButton.cs

@@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			await this.SliceBedplate();
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PartPreviewWindow/View3D/View3DWidget.cs

@@ -388,7 +388,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 		public bool DisplayAllValueData { get; set; }
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			viewControls3D.TransformStateChanged -= ViewControls3D_TransformStateChanged;
 			Scene.SelectionChanged -= Scene_SelectionChanged;

PartPreviewWindow/ViewControls3D.cs

@@ -638,7 +638,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			};
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			sceneContext.Scene.SelectionChanged -= Scene_SelectionChanged;
 			base.OnClosed(e);

PrinterCommunication/Io/MacroProcessingStream.cs

@@ -51,10 +51,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
 		private double startingBedTemp = 0;
 		private List<double> startingExtruderTemps = new List<double>();
 		private Stopwatch timeHaveBeenWaiting = new Stopwatch();
-		private bool waitingForUserInput = false;
+		private bool WaitingForUserInput { get; set; } = false;
 		private PrinterConfig printer;
 		QueuedCommandsStream queuedCommandsStream;
 
+		RunningMacroPage currentPage = null;
+
 		public MacroProcessingStream(QueuedCommandsStream queuedCommandsStream, PrinterConfig printer)
 			: base(queuedCommandsStream)
 		{
@@ -69,7 +71,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
 
 		public void Continue()
 		{
-			waitingForUserInput = false;
+			WaitingForUserInput = false;
 			timeHaveBeenWaiting.Reset();
 			maxTimeToWaitForOk = 0;
 			commandsToRepeat.Clear();
@@ -109,7 +111,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
 		{
 			string lineToSend = null;
 
-			if (waitingForUserInput)
+			if (WaitingForUserInput)
 			{
 				lineToSend = "";
 				Thread.Sleep(100);
@@ -141,7 +143,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
 			{
 				lineToSend = base.ReadLine();
 
-				if (lineToSend != null)
+				if (!string.IsNullOrEmpty(lineToSend))
 				{
 					if (lineToSend.StartsWith(MacroPrefix) && lineToSend.TrimEnd().EndsWith(")"))
 					{
@@ -202,18 +204,28 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
 						switch (command)
 						{
 							case "choose_material":
-								waitingForUserInput = true;
+								WaitingForUserInput = true;
 								macroData.showMaterialSelector = true;
 								macroData.waitOk = true;
 
 								UiThread.RunOnIdle(() =>
 								{
-									DialogWindow.Show(new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme));
+									// we are continuing normaly
+									if (currentPage != null)
+									{
+										currentPage.ContinueToNextPage = true;
+									}
+									DialogWindow.Show(currentPage = new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme));
 								});
 								break;
 
 							case "close":
 								runningMacro = false;
+								// we are closing normaly
+								if (currentPage != null)
+								{
+									currentPage.ContinueToNextPage = true;
+								}
 								UiThread.RunOnIdle(() => DialogWindow.Close(typeof(RunningMacroPage)));
 								break;
 
@@ -231,11 +243,16 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
 								break;
 
 							case "show_message":
-								waitingForUserInput = macroData.waitOk | macroData.expireTime > 0;
+								WaitingForUserInput = macroData.waitOk | macroData.expireTime > 0;
 
 								UiThread.RunOnIdle(() =>
 								{
-									DialogWindow.Show(new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme));
+									// we are continuing normaly
+									if (currentPage != null)
+									{
+										currentPage.ContinueToNextPage = true;
+									}
+									DialogWindow.Show(currentPage = new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme));
 								});
 
 								break;
@@ -266,7 +283,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
 					printer.Connection.TargetBedTemperature = startingBedTemp;
 				}
 			}
-			waitingForUserInput = false;
+			WaitingForUserInput = false;
 			timeHaveBeenWaiting.Reset();
 			maxTimeToWaitForOk = 0;
 			UiThread.RunOnIdle(() => DialogWindow.Close(typeof(RunningMacroPage)));

PrinterControls/ControlWidgets/AdjustmentControls.cs

@@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 			base.OnLoad(args);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/ControlWidgets/CalibrationControls.cs

@@ -149,7 +149,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 				editButton);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/ControlWidgets/FanControls.cs

@@ -144,7 +144,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 				theme);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/ControlWidgets/MacroControls.cs

@@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 			}, ref unregisterEvents);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/ControlWidgets/MovementControls.cs

@@ -88,7 +88,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 				editButton);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);
@@ -312,7 +312,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 			zOffsetStreamDisplay.Text = zoffset.ToString("0.##");
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(null, null);
 			base.OnClosed(e);

PrinterControls/ControlWidgets/PowerControls.cs

@@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 				theme);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/JogControls.cs

@@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl
 			AxisMoveAmount = moveAmount;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/ManualPrinterControls.cs

@@ -152,7 +152,7 @@ namespace MatterHackers.MatterControl
 			base.OnLoad(args);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/PrinterConnections/SetupStepComPortManual.cs

@@ -121,7 +121,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			abortCancel = false;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/PrinterConnections/SetupStepComPortTwo.cs

@@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			abortCancel = false;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

PrinterControls/TerminalWindow/TextScrollWidget.cs

@@ -174,7 +174,7 @@ namespace MatterHackers.MatterControl
 			System.IO.File.WriteAllLines(filePath, allSourceLinesTemp);
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

RootSystemWindow.cs

@@ -321,7 +321,7 @@ namespace MatterHackers.MatterControl
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			UserSettings.Instance.Fields.StartCountDurringExit = UserSettings.Instance.Fields.StartCount;
 

SetupWizard/AndroidConnectDevicePage.cs

@@ -195,7 +195,7 @@ namespace MatterHackers.MatterControl
 			this.Invalidate();
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

SetupWizard/DialogWindow.cs

@@ -123,7 +123,7 @@ namespace MatterHackers.MatterControl
 			return wizardWindow;
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

SetupWizard/SetupWizardTroubleshooting.cs

@@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl
 			});
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			if(checkForPermissionTimer != null)
 			{

SlicerConfiguration/PresetSelectorWidget.cs

@@ -220,7 +220,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			ActiveSliceSettings.MaterialPresetChanged -= ActiveSliceSettings_MaterialPresetChanged;
 			unregisterEvents?.Invoke(this, null);

SlicerConfiguration/SliceSettingsWidget.cs

@@ -994,7 +994,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			}
 		}
 
-		public override void OnClosed(ClosedEventArgs e)
+		public override void OnClosed(EventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);
 			base.OnClosed(e);

Submodules/agg-sharp

@@ -1 +1 @@
-Subproject commit c2a6940c756d17cf1c804f0f6ee085565f885910
+Subproject commit 0dc9dbf7bdbd5e712aa447b0b9d11b4bc662d29e