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

Use unwaited async load for new LoadPlateFromHistory method

Browse source 
- Issue MatterHackers/MCCentral#2552
Startup hangs at "ProfileManager" when complex items are on bed
This commit is contained in:
John Lewin 2018-02-14 18:10:21 -08:00
parent 8de71ea412
commit 4ffde89cab
2 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -71,13 +71,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// TODO: This application init code should move to caller and be awaited
var printer = new PrinterConfig(await LoadProfileAsync(this.LastProfileID));
await printer.Initialize(new EditContext()
{
ContentStore = ApplicationController.Instance.Library.PlatingHistory,
SourceItem = BedConfig.GetLastPlateOrNew()
});
await ApplicationController.Instance.SetActivePrinter(printer);
// Non-blocking plate load on startup
printer.LoadPlateFromHistory().ConfigureAwait(false);
}
}
@ -144,11 +141,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var printer = new PrinterConfig(await ProfileManager.LoadProfileAsync(printerID));
await printer.Initialize(new EditContext()
{
ContentStore = ApplicationController.Instance.Library.PlatingHistory,
SourceItem = BedConfig.GetLastPlateOrNew()
});
await printer.LoadPlateFromHistory();
await ApplicationController.Instance.SetActivePrinter(printer);
}
@ -478,11 +471,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
ProfileManager.Instance.LastProfileID = guid;
var printer = new PrinterConfig(printerSettings);
await printer.Initialize(new EditContext()
{
ContentStore = ApplicationController.Instance.Library.PlatingHistory,
SourceItem = BedConfig.GetLastPlateOrNew()
});
await printer.LoadPlateFromHistory();
await ApplicationController.Instance.SetActivePrinter(printer);