Refactored DataStore Proto.

1 files changed, 20 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreItem.cs b/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreItem.cs
index c58e3ab28..4327a0bd6 100644
--- a/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreItem.cs
+++ b/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreItem.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,7 +12,24 @@ namespace Tango.DataStore.Remote
         public string Guid { get; set; }
         public string Key { get; set; }
         public DataType Type { get; set; }
-        public object Value { get; set; }
+
+        private object _value;
+        public object Value
+        {
+            get
+            {
+                if (_value is JObject jObject)
+                {
+                    return (jObject.ToObject<DataStoreProtoObject>());
+                }
+                else
+                {
+                    return _value;
+                }
+            }
+            set { _value = value; }
+        }
+
         public DateTime Date { get; set; }
         public bool IsSynchronized { get; set; }