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

Make the 'install update' from the windowed about page still close MC>

Browse source
This commit is contained in:
Lars Brubaker 2015-05-22 10:45:32 -07:00
parent 1395676fe4
commit 570fe3a3ee
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
AboutPage/UpdateControlData.cs
View file

@ -393,7 +393,7 @@ namespace MatterHackers.MatterControl
public static EventHandler InstallUpdateFromMainActivity = null;
public bool InstallUpdate(GuiWidget windowToClose)
public bool InstallUpdate()
{
string downloadToken = ApplicationSettings.Instance.get("CurrentBuildToken");
@ -432,13 +432,8 @@ namespace MatterHackers.MatterControl
installUpdate.StartInfo.FileName = friendlyFileName;
installUpdate.Start();
while (windowToClose != null && windowToClose as SystemWindow == null)
{
windowToClose = windowToClose.Parent;
}
//Attempt to close current application
SystemWindow topSystemWindow = windowToClose as SystemWindow;
SystemWindow topSystemWindow = MatterControlApplication.Instance as SystemWindow;
if (topSystemWindow != null)
{
topSystemWindow.CloseOnIdle();

2
AboutPage/UpdateControlView.cs
View file

@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl
{
try
{
if (!UpdateControlData.Instance.InstallUpdate(this))
if (!UpdateControlData.Instance.InstallUpdate())
{
installUpdateLink.Visible = false;
updateStatusText.Text = string.Format("Oops! Unable to install update.".Localize());