MERGE

1 files changed, 15 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
index 3c245510b..ede66dc19 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
@@ -15,6 +15,8 @@ namespace Tango.MachineStudio.UI.Notifications
 {
     public class DefaultNotificationProvider : ExtendedObject, INotificationProvider
     {
+        private static List<Type> viewTypes;
+
         public ObservableCollection<TaskItem> TaskItems { get; private set; }
 
         public bool HasTaskItems
@@ -99,7 +101,19 @@ namespace Tango.MachineStudio.UI.Notifications
         {
             String viewName = typeof(VM).Name.Replace("VM", "");
 
-            var view = Activator.CreateInstance(AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypes()).Single(x => x.Name == viewName)) as FrameworkElement;
+            if (viewTypes == null)
+            {
+                viewTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypes()).ToList();
+            }
+
+            var viewType = viewTypes.SingleOrDefault(x => x.Name == viewName);
+
+            if (viewType == null)
+            {
+                throw new NullReferenceException("Could not locate view " + viewName);
+            }
+
+            var view = Activator.CreateInstance(viewType) as FrameworkElement;
             DialogWindow dialog = new DialogWindow();
             dialog.Owner = Application.Current.MainWindow;
             dialog.InnerContent = view;