universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't load some configuration options if they don't exist (prevent crash)

Browse Source
This commit is contained in:
Michael Becker 2014-08-11 15:54:57 -04:00
parent 0e56e7c4ae
commit 47816635ad
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
View File

@ -551,11 +551,14 @@ namespace UniversalEditor.UserInterface
UpdateSplashScreenStatus("Loading main menu items");
MarkupTagElement tagMainMenuItems = (mvarRawMarkup.FindElement("UniversalEditor", "Application", "MainMenu", "Items") as MarkupTagElement);
foreach (MarkupElement elItem in tagMainMenuItems.Elements)
if (tagMainMenuItems != null)
{
MarkupTagElement tagItem = (elItem as MarkupTagElement);
if (tagItem == null) continue;
InitializeMainMenuItem(tagItem, null);
foreach (MarkupElement elItem in tagMainMenuItems.Elements)
{
MarkupTagElement tagItem = (elItem as MarkupTagElement);
if (tagItem == null) continue;
InitializeMainMenuItem(tagItem, null);
}
}
UpdateSplashScreenStatus("Loading command bars");
@ -595,7 +598,11 @@ namespace UniversalEditor.UserInterface
UpdateSplashScreenStatus("Setting language");
if (mvarDefaultLanguage != null)
if (mvarDefaultLanguage == null)
{
mvarDefaultLanguage = new Language();
}
else
{
foreach (Command cmd in mvarCommands)
{