From 12d6380ddd3a9dff8c41c9d34981e91e805e3585 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 1 Nov 2016 15:32:27 -0700 Subject: [PATCH] Revise SystemWindow Close/Open calls to fix out of order SysWindow stack --- .../PrinterConnections/ShowAuthPanel.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/PrinterControls/PrinterConnections/ShowAuthPanel.cs b/PrinterControls/PrinterConnections/ShowAuthPanel.cs index 40078c123..cfd752838 100644 --- a/PrinterControls/PrinterConnections/ShowAuthPanel.cs +++ b/PrinterControls/PrinterConnections/ShowAuthPanel.cs @@ -78,21 +78,28 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections UiThread.RunOnIdle(WizardWindow.Close); } }; + var createAccountButton = textImageButtonFactory.Generate("Create Account".Localize()); createAccountButton.Name = "Create Account From Connection Wizard Button"; createAccountButton.Margin = new Agg.BorderDouble(right: 5); createAccountButton.Click += (s, e) => { - WizardWindow.ChangeToAccountCreate(); - UiThread.RunOnIdle(WizardWindow.Close); + UiThread.RunOnIdle (() => + { + WizardWindow.Close(); + WizardWindow.ChangeToAccountCreate(); + }); }; var signInButton = textImageButtonFactory.Generate("Sign In".Localize()); signInButton.Name = "Sign In From Connection Wizard Button"; signInButton.Click += (s, e) => { - WizardWindow.ShowAuthDialog?.Invoke(); - UiThread.RunOnIdle(WizardWindow.Close); + UiThread.RunOnIdle (() => + { + WizardWindow.Close(); + WizardWindow.ShowAuthDialog?.Invoke(); + }); }; footerRow.AddChild(skipButton);