From 43c8fa632ff972e2260291071268e9a017bdeee3 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Thu, 26 Jun 2014 18:42:46 -0400 Subject: [PATCH] Only load command bars if they're specified in the config --- .../UniversalEditor.UserInterface/Engine.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs index 33f3e058..98ea39bb 100644 --- a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs +++ b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs @@ -398,14 +398,17 @@ namespace UniversalEditor.UserInterface UpdateSplashScreenStatus("Loading command bars"); MarkupTagElement tagCommandBars = (mvarRawMarkup.FindElement("UniversalEditor", "Application", "CommandBars") as MarkupTagElement); - foreach (MarkupElement elCommandBar in tagCommandBars.Elements) + if (tagCommandBars != null) { - MarkupTagElement tagCommandBar = (elCommandBar as MarkupTagElement); - if (tagCommandBar == null) continue; - if (tagCommandBar.FullName != "CommandBar") continue; - InitializeCommandBar(tagCommandBar); + foreach (MarkupElement elCommandBar in tagCommandBars.Elements) + { + MarkupTagElement tagCommandBar = (elCommandBar as MarkupTagElement); + if (tagCommandBar == null) continue; + if (tagCommandBar.FullName != "CommandBar") continue; + InitializeCommandBar(tagCommandBar); + } } - + UpdateSplashScreenStatus("Loading languages and translations"); MarkupTagElement tagLanguages = (mvarRawMarkup.FindElement("UniversalEditor", "Application", "Languages") as MarkupTagElement);