From 124654ffc4ef8ee8a67aca8af3d9a6e58bd38f59 Mon Sep 17 00:00:00 2001
From: Kamil Rojewski <kamil.rojewski@gmail.com>
Date: Thu, 25 Mar 2021 18:25:00 +0100
Subject: fixed packing structs (#6530)

* fixed packing structs in nested buffers

* fixed packing structs
---
 src/idl_gen_ts.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/idl_gen_ts.cpp b/src/idl_gen_ts.cpp
index a6d4ef6c..b9e32f56 100644
--- a/src/idl_gen_ts.cpp
+++ b/src/idl_gen_ts.cpp
@@ -856,10 +856,16 @@ class TsGenerator : public BaseGenerator {
             const std::string field_accessor = "this." + field_name + "()";
             field_val = GenNullCheckConditional(field_accessor,
                                                 field_accessor + "!.unpack()");
-            field_offset_decl = GenNullCheckConditional(
+            auto packing = GenNullCheckConditional(
                 "this." + field_name, "this." + field_name + "!.pack(builder)",
                 "0");
 
+            if (sd.fixed) {
+              field_offset_val = std::move(packing);
+            } else {
+              field_offset_decl = std::move(packing);
+            }
+
             break;
           }
 
-- 
cgit v1.2.3