Merge pull request #4083 from WinstonMao/patch-1

Update ApplicationController.cs
This commit is contained in:
johnlewin 2018-12-13 09:27:05 -08:00 committed by GitHub
commit 376d0840a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3208,13 +3208,14 @@ If you experience adhesion problems, please re-run leveling."
try
{
ReportStartupProgress(0.15, "MatterControlApplication.Initialize");
ApplicationController.LoadTranslationMap();
var mainView = await Initialize(systemWindow, (progress0To1, status) =>
{
ReportStartupProgress(0.2 + progress0To1 * 0.7, status);
});
ApplicationController.LoadTranslationMap();
ReportStartupProgress(0.9, "AddChild->MainView");
systemWindow.AddChild(mainView, 0);
@ -3427,4 +3428,4 @@ If you experience adhesion problems, please re-run leveling."
{
}
}
}
}