From 3ef91b4fe6127077b42795ebd0965bbd686a164c Mon Sep 17 00:00:00 2001
From: Joy Peterson <jpeterson@insidesales.com>
Date: Fri, 6 Mar 2015 15:42:56 -0700
Subject: [PATCH] Do not add DefaultRibbon to ribbonUiLookup if it is already
 there.

---
 .../RibbonFactory/Internal/ViewModelResolver.cs              | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/VSTOContrib.Core/RibbonFactory/Internal/ViewModelResolver.cs b/src/VSTOContrib.Core/RibbonFactory/Internal/ViewModelResolver.cs
index 6837f1d..0b4f49d 100644
--- a/src/VSTOContrib.Core/RibbonFactory/Internal/ViewModelResolver.cs
+++ b/src/VSTOContrib.Core/RibbonFactory/Internal/ViewModelResolver.cs
@@ -81,10 +81,9 @@ void ViewProviderNewView(object sender, NewViewEventArgs e)
         {
             VstoContribLog.Debug(_ => _("ViewProvider.NewView Raised, Type: {0}, View: {1}, Context: {2}",
                 e.RibbonType, e.ViewInstance.ToLogFormat(), e.ViewContext.ToLogFormat()));
-            if (ribbonUiLookup.ContainsKey("default"))
+            if (!ribbonUiLookup.ContainsKey(e.RibbonType) && ribbonUiLookup.ContainsKey(DefaultRibbon))
             {
-                ribbonUiLookup.Add(e.RibbonType, ribbonUiLookup["default"]);
-                ribbonUiLookup.Remove("default");
+                ribbonUiLookup.Add(e.RibbonType, ribbonUiLookup[DefaultRibbon]);
             }
             var viewModel = GetOrCreateViewModel(e.RibbonType, e.ViewContext ?? NullContext.Instance, e.ViewInstance);
             if (viewModel == null) return;