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

Hook ProfileManager listener up to SettingChanged

Browse source
This commit is contained in:
John Lewin 2018-11-30 10:32:30 -08:00
parent ed16199978
commit d850573340
1 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -272,6 +272,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
_activeProfileIDs.Remove(printerID);
UserSettings.Instance.set($"ActiveProfileIDs-{UserName}", JsonConvert.SerializeObject(_activeProfileIDs));
// Unregister listener
if (ApplicationController.Instance.ActivePrinters.FirstOrDefault(p => p.Settings.ID == printerID) is PrinterConfig printer)
{
printer.Settings.SettingChanged -= PrinterSettings_SettingChanged;
}
}
catch
{
@ -349,7 +355,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// This can happen when a profile is pushed to a user account from the web.
printerSettings.SetValue(SettingsKey.printer_name, printerInfo.Name);
}
return printerSettings;
}
else if (ApplicationController.GetPrinterProfileAsync != null)
{
@ -359,12 +364,36 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
// If successful, persist downloaded profile and return
printerSettings.Save();
return printerSettings;
}
}
// Otherwise attempt to recover to a working profile
return await RecoverProfile(printerInfo);
// Recover to a default working profile if still null
if (printerSettings == null)
{
printerSettings = await RecoverProfile(printerInfo);
}
// Register listener on non-null settings
if (printerSettings != null)
{
// TODO: This is likely to leak and keep printerSettings in memory in some cases until we combine PrinterConfig
// loading into profile manager and have a single owner of loaded printers that can unwire this when their
// tabs close
//
// Register listener
printerSettings.SettingChanged += PrinterSettings_SettingChanged;
}
return printerSettings;
}
// Settings persistence moved from PrinterSettings into ProfileManager to break dependency around ProfileManager paths/MatterControl specific details
private static void PrinterSettings_SettingChanged(object sender, EventArgs e)
{
if (sender is PrinterSettings settings)
{
settings.Save();
}
}
public async static Task<PrinterSettings> RecoverProfile(PrinterInfo printerInfo)