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

Updates to typography

Browse source 
fixing warnings
moving experimental code
This commit is contained in:
LarsBrubaker 2020-06-05 07:52:23 -07:00
parent 01309e9b0f
commit 987f87a472
19 changed files with 1951 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -651,7 +651,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return await ApplicationController.Instance.OpenEmptyPrinter(guid);
}
public async static Task<PrinterSettings> LoadOemSettingsAsync(PublicDevice publicDevice, string make, string model)
public static async Task<PrinterSettings> LoadOemSettingsAsync(PublicDevice publicDevice, string make, string model)
{
string cacheScope = Path.Combine("public-profiles", make);
string cachePath = ApplicationController.CacheablePath(cacheScope, publicDevice.CacheKey);
@ -664,7 +664,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// The collector specifically returns null to ensure LoadCacheable skips writing the
// result to the cache. After this result is returned, it will attempt to load from
// the local cache if the collector yielded no result
if(File.Exists(cachePath)
if (File.Exists(cachePath)
|| ApplicationController.DownloadPublicProfileAsync == null)
{
return null;