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

Merge pull request #4012 from jlewin/master

Browse source 
Fix null ref during print due to invalid reference
This commit is contained in:
johnlewin 2018-11-21 12:54:04 -08:00 • committed by GitHub
commit 4f07ef398b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControlLib/PrinterControls/ControlWidgets/FanControls.cs
View file

@ -33,8 +33,6 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.PrinterControls
{
@ -42,7 +40,7 @@ namespace MatterHackers.MatterControl.PrinterControls
{
private EditableNumberDisplay fanSpeedDisplay;
private ICheckbox toggleSwitch;
private RoundedToggleSwitch toggleSwitch;
private PrinterConfig printer;
private FanControls(PrinterConfig printer, ThemeConfig theme)
@ -94,7 +92,7 @@ namespace MatterHackers.MatterControl.PrinterControls
VAnchor = VAnchor.Center
});
var toggleSwitch = new RoundedToggleSwitch(theme)
toggleSwitch = new RoundedToggleSwitch(theme)
{
Margin = new BorderDouble(5, 0),
VAnchor = VAnchor.Center

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

@ -540,10 +540,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
if (IsGuestProfile && !PrintersImported)
{
int intialCount = this.Profiles.Count;
// Import Sqlite printer profiles into local json files
DataStorage.ClassicDB.ClassicSqlitePrinterProfiles.ImportPrinters(Instance, UserProfilesDirectory);
PrintersImported = true;
Save();
if (intialCount != this.Profiles.Count)
{
this.Save();
}
}
}