merge

1 files changed, 2 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Tango.Core/ExtendedObject.cs b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
index f09a82ae9..acead4157 100644
--- a/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs
@@ -1,5 +1,4 @@
-using LiteDB;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -34,7 +33,6 @@ namespace Tango.Core
         /// </summary>
         [JsonIgnore]
         [NotMapped]
-        [BsonIgnore]
         public LogManager LogManager
         {
             get { return LogManager.Default; }
@@ -45,7 +43,6 @@ namespace Tango.Core
         /// </summary>
         [JsonIgnore]
         [NotMapped]
-        [BsonIgnore]
         public TemporaryManager TemporaryManager
         {
             get { return TemporaryManager.Default; }
@@ -82,7 +79,7 @@ namespace Tango.Core
         {
             InvokeUI(() =>
             {
-                foreach (var prop in this.GetType().GetProperties().Where(x => typeof(RelayCommand).IsAssignableFrom(x.PropertyType)))
+                foreach (var prop in this.GetType().GetProperties().Where(x => x.PropertyType == typeof(RelayCommand)))
                 {
                     var value = prop.GetValue(this) as RelayCommand;
 
@@ -101,7 +98,6 @@ namespace Tango.Core
         /// </summary>
         [NotMapped]
         [JsonIgnore]
-        [BsonIgnore]
         public bool DesignMode
         {
             get { return (DesignerProperties.GetIsInDesignMode(new DependencyObject())); }