DataStore improvements.

2 files changed, 17 insertions, 1 deletions

diff --git a/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs b/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs
index c42935368..c1b45e37f 100644
--- a/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs
+++ b/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs
@@ -33,6 +33,16 @@ namespace Tango.DataStore.EF
         {
             using (var db = ObservablesContext.CreateDefault())
             {
+                var globalItem = db.GlobalDataStoreItems.FirstOrDefault(x => x.CollectionName == Name && x.Key == key);
+
+                if (globalItem != null)
+                {
+                    if (globalItem.DataType != (int)type)
+                    {
+                        throw new InvalidOperationException("A global data store item exists with the same key, but different data type.");
+                    }
+                }
+
                 DataStoreItem item = db.DataStoreItems.SingleOrDefault(x => x.CollectionName == Name && x.Key == key);
 
                 if (item == null)
diff --git a/Software/Visual_Studio/DataStore/Tango.DataStore.Editing/DataStoreItemModel.cs b/Software/Visual_Studio/DataStore/Tango.DataStore.Editing/DataStoreItemModel.cs
index 3b1741395..8f00a0ec6 100644
--- a/Software/Visual_Studio/DataStore/Tango.DataStore.Editing/DataStoreItemModel.cs
+++ b/Software/Visual_Studio/DataStore/Tango.DataStore.Editing/DataStoreItemModel.cs
@@ -53,7 +53,13 @@ namespace Tango.DataStore.Editing
 
         public String FormattedValue
         {
-            get { return this.ToString().ToOneLine(); }
+            get
+            {
+                var value = this.ToString();
+
+                if (value != null) return value.ToOneLine();
+                return null;
+            }
         }
 
         public string Guid { get; set; }