From 6722c9c7e058d68856b519264db7d552db1f74f5 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Fri, 18 Jul 2014 15:20:15 -0400 Subject: [PATCH] Do not load languages if they don't exist (to prevent crash) --- .../UniversalEditor.UserInterface/Engine.cs | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs index a0c2d459..216bc7e2 100644 --- a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs +++ b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs @@ -511,18 +511,21 @@ namespace UniversalEditor.UserInterface UpdateSplashScreenStatus("Loading languages and translations"); MarkupTagElement tagLanguages = (mvarRawMarkup.FindElement("UniversalEditor", "Application", "Languages") as MarkupTagElement); - foreach (MarkupElement elLanguage in tagLanguages.Elements) + if (tagLanguages != null) { - MarkupTagElement tagLanguage = (elLanguage as MarkupTagElement); - if (tagLanguage == null) continue; - if (tagLanguage.FullName != "Language") continue; - InitializeLanguage(tagLanguage); - } + foreach (MarkupElement elLanguage in tagLanguages.Elements) + { + MarkupTagElement tagLanguage = (elLanguage as MarkupTagElement); + if (tagLanguage == null) continue; + if (tagLanguage.FullName != "Language") continue; + InitializeLanguage(tagLanguage); + } - MarkupAttribute attDefaultLanguageID = tagLanguages.Attributes["DefaultLanguageID"]; - if (attDefaultLanguageID != null) - { - mvarDefaultLanguage = mvarLanguages[attDefaultLanguageID.Value]; + MarkupAttribute attDefaultLanguageID = tagLanguages.Attributes["DefaultLanguageID"]; + if (attDefaultLanguageID != null) + { + mvarDefaultLanguage = mvarLanguages[attDefaultLanguageID.Value]; + } } #endregion