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

Don't call uninitialized action.

Browse source 
This action gets set by code that is part of CloudServices and not part of the common code.
This commit is contained in:
tellingmachine 2016-08-12 11:27:40 -07:00
parent 9a8a4b0718
commit b96ff64a4e
1 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

51
ApplicationView/MainApplicationWidget.cs
View file

@ -489,24 +489,26 @@ namespace MatterHackers.MatterControl
if (!System.IO.File.Exists(@"/storage/sdcard0/Download/LaunchTestPrint.stl"))
{
bool showAuthWindow = WizardWindow.ShouldShowAuthPanel?.Invoke() ?? false;
if (showAuthWindow)
{
//Launch window to prompt user to log in
UiThread.RunOnIdle(() => WizardWindow.ShowPrinterSetup());
}
else
{
//If user in logged in sync before checking to prompt to create printer
ApplicationController.SyncPrinterProfiles().ContinueWith((task) =>
{
ApplicationController.Instance.ReloadAdvancedControlsPanel();
if (!ProfileManager.Instance.ActiveProfiles.Any())
{
// Start the setup wizard if no profiles exist
UiThread.RunOnIdle(() => WizardWindow.ShowPrinterSetup());
}
});
}
if (showAuthWindow)
{
//Launch window to prompt user to log in
UiThread.RunOnIdle(() => WizardWindow.ShowPrinterSetup());
}
else
{
//If user in logged in sync before checking to prompt to create printer
if (ApplicationController.SyncPrinterProfiles == null)
{
RunSetupIfRequired();
}
else
{
ApplicationController.SyncPrinterProfiles.Invoke().ContinueWith((task) =>
{
RunSetupIfRequired();
});
}
}
if (OsInformation.OperatingSystem != OSType.Windows)
{
@ -532,7 +534,18 @@ namespace MatterHackers.MatterControl
}, 2);
}
}
private EventHandler unregisterEvent;
private static void RunSetupIfRequired()
{
ApplicationController.Instance.ReloadAdvancedControlsPanel();
if (!ProfileManager.Instance.ActiveProfiles.Any())
{
// Start the setup wizard if no profiles exist
UiThread.RunOnIdle(() => WizardWindow.ShowPrinterSetup());
}
}
private EventHandler unregisterEvent;
public void StartPrintingTest()
{
QueueData.Instance.RemoveAll();