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

Merge pull request #1031 from jlewin/master

Browse source 
Remove ProfileData property, show wizard if visible printers < 1
This commit is contained in:
johnlewin 2016-06-29 14:23:12 -07:00 • committed by GitHub
commit ea7683dea2
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlApplication.cs
View file

@ -718,7 +718,7 @@ namespace MatterHackers.MatterControl
UiThread.RunOnIdle(() => WizardWindow.Show<LicenseAgreementPage>("SoftwareLicense", "Software License Agreement"));
}
if (ProfileManager.Instance.Profiles.Count == 0)
if (!ProfileManager.Instance.ActiveProfiles.Any())
{
// Start the setup wizard if no profiles exist
UiThread.RunOnIdle(() => WizardWindow.Show());

2
SettingsManagement/OemSettings.cs
View file

@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.SettingsManagement
profileRequest.Request();
// Block on the current thread until the response has completed
autoResetEvent.WaitOne(12000);
autoResetEvent.WaitOne(30000);
return responseText;
});

2
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -141,8 +141,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
public static ProfileManager ProfileData { get; private set; }
internal static void SwitchToProfile(string printerID)
{
var profile = ProfileManager.LoadProfile(printerID);