From 17949055f6d2fc364da091a5ace49619759fd0fe Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 7 Apr 2025 13:49:26 -0400
Subject: [PATCH] Fix local ID being reordered in output JSON

---
 src/core/events.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/events.cpp b/src/core/events.cpp
index 8c5e5077..2dce4192 100644
--- a/src/core/events.cpp
+++ b/src/core/events.cpp
@@ -146,12 +146,13 @@ EventFrame *ObjectEvent::createEventFrame() {
 OrderedJson::object ObjectEvent::buildEventJson(Project *) {
     OrderedJson::object objectJson;
 
-    if (projectConfig.eventCloneObjectEnabled) {
-        objectJson["type"] = Event::typeToJsonKey(Event::Type::Object);
-    }
     QString idName = this->getIdName();
     if (!idName.isEmpty())
         objectJson["local_id"] = idName;
+
+    if (projectConfig.eventCloneObjectEnabled) {
+        objectJson["type"] = Event::typeToJsonKey(Event::Type::Object);
+    }
     objectJson["graphics_id"] = this->getGfx();
     objectJson["x"] = this->getX();
     objectJson["y"] = this->getY();
@@ -255,10 +256,11 @@ EventFrame *CloneObjectEvent::createEventFrame() {
 OrderedJson::object CloneObjectEvent::buildEventJson(Project *project) {
     OrderedJson::object cloneJson;
 
-    cloneJson["type"] = Event::typeToJsonKey(Event::Type::CloneObject);
     QString idName = this->getIdName();
     if (!idName.isEmpty())
         cloneJson["local_id"] = idName;
+
+    cloneJson["type"] = Event::typeToJsonKey(Event::Type::CloneObject);
     cloneJson["graphics_id"] = this->getGfx();
     cloneJson["x"] = this->getX();
     cloneJson["y"] = this->getY();