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

Merge branch 'master' into master

Browse source
This commit is contained in:
johnlewin 2018-11-16 16:23:06 -08:00 • committed by GitHub
commit f35d4aaf7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -1698,22 +1698,6 @@ namespace MatterHackers.MatterControl
}
}
if (this.ActivePrinter is PrinterConfig printer
&& printer.Settings.PrinterSelected
&& printer.Settings.GetValue<bool>(SettingsKey.auto_connect))
{
ApplicationController.StartupTasks.Add(new ApplicationController.StartupTask()
{
Title = "Auto Connect".Localize(),
Priority = 100,
Action = (progress, cancellationToken) =>
{
printer.Connection.Connect();
return Task.CompletedTask;
}
});
}
if (AssetObject3D.AssetManager == null)
{
AssetObject3D.AssetManager = new AssetManager();
@ -1806,6 +1790,12 @@ namespace MatterHackers.MatterControl
this.OnOpenPrintersChanged(new OpenPrintersChangedEventArgs(printer, OpenPrintersChangedEventArgs.OperationType.Add));
if (printer.Settings.PrinterSelected
&& printer.Settings.GetValue<bool>(SettingsKey.auto_connect))
{
printer.Connection.Connect();
}
return printer;
}