Refactored DataStore Proto.

1 files changed, 23 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreGetResponse.cs b/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreGetResponse.cs
index a3c5eb99c..cc3b157e8 100644
--- a/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreGetResponse.cs
+++ b/Software/Visual_Studio/Tango.DataStore.Remote/RemoteDataStoreGetResponse.cs
@@ -8,6 +8,28 @@ namespace Tango.DataStore.Remote
 {
     public class RemoteDataStoreGetResponse
     {
-        public Object Value { get; set; }
+        public DataType DataType { 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; }
     }
 }