From 1c5ba427c242611a3f33bd794a65a3e9ed887b96 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Wed, 6 Jan 2021 19:19:33 +0100
Subject: [PATCH] Serialize the context menu ID

---
 src/common/serialization/vst3/context-menu-proxy.cpp | 7 +++++--
 src/common/serialization/vst3/context-menu-proxy.h   | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/serialization/vst3/context-menu-proxy.cpp b/src/common/serialization/vst3/context-menu-proxy.cpp
index 8b210c1b..20cb1df7 100644
--- a/src/common/serialization/vst3/context-menu-proxy.cpp
+++ b/src/common/serialization/vst3/context-menu-proxy.cpp
@@ -20,8 +20,11 @@ Vst3ContextMenuProxy::ConstructArgs::ConstructArgs() {}
 
 Vst3ContextMenuProxy::ConstructArgs::ConstructArgs(
     Steinberg::IPtr<Steinberg::FUnknown> object,
-    size_t owner_instance_id)
-    : owner_instance_id(owner_instance_id), context_menu_args(object) {}
+    size_t owner_instance_id,
+    size_t context_menu_id)
+    : owner_instance_id(owner_instance_id),
+      context_menu_id(context_menu_id),
+      context_menu_args(object) {}
 
 Vst3ContextMenuProxy::Vst3ContextMenuProxy(const ConstructArgs&& args)
     : YaContextMenu(std::move(args.context_menu_args)),
diff --git a/src/common/serialization/vst3/context-menu-proxy.h b/src/common/serialization/vst3/context-menu-proxy.h
index 63cb5342..1fbeba7c 100644
--- a/src/common/serialization/vst3/context-menu-proxy.h
+++ b/src/common/serialization/vst3/context-menu-proxy.h
@@ -48,7 +48,8 @@ class Vst3ContextMenuProxy : public YaContextMenu {
          * we'll support any interfaces this object also supports.
          */
         ConstructArgs(Steinberg::IPtr<FUnknown> object,
-                      size_t owner_instance_id);
+                      size_t owner_instance_id,
+                      size_t context_menu_id);
 
         /**
          * The unique instance identifier of the proxy object instance this
@@ -69,6 +70,7 @@ class Vst3ContextMenuProxy : public YaContextMenu {
         template <typename S>
         void serialize(S& s) {
             s.value8b(owner_instance_id);
+            s.value8b(context_menu_id);
             s.object(context_menu_args);
         }
     };