Refactored DataStore Proto.

1 files changed, 22 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStorePutRequest.cs b/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStorePutRequest.cs
index 6ea13bf6b..77aa5e41f 100644
--- a/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStorePutRequest.cs
+++ b/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStorePutRequest.cs
@@ -11,6 +11,27 @@ namespace Tango.DataStore.Remote
         public String Collection { get; set; }
         public DataType DataType { get; set; }
         public String Key { get; set; }
-        public Object Value { get; set; }
+
+        private Object _value;
+        public Object Value
+        {
+            get
+            {
+                return DataType == DataType.Proto ? ProtoObject : _value;
+            }
+            set
+            {
+                if (value is DataStoreProtoObject protoValue)
+                {
+                    ProtoObject = protoValue;
+                }
+                else
+                {
+                    _value = value;
+                }
+            }
+        }
+
+        public DataStoreProtoObject ProtoObject { get; set; }
     }
 }