From 854088c48c4020f35019851137197b1112a9b9ee Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Fri, 3 Apr 2026 22:57:58 -0700
Subject: [PATCH] io/fileview: convert containers to QVariantList/Map before
 serialize

QJsonValue::fromVariant doesn't do this automatically for some reason.
---
 changelog/next.md      |  1 +
 src/io/jsonadapter.cpp | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/changelog/next.md b/changelog/next.md
index 1137e9a..86687eb 100644
--- a/changelog/next.md
+++ b/changelog/next.md
@@ -69,6 +69,7 @@ set shell id.
 - Fixed ScreencopyView pixelation when scaled.
 - Fixed JsonAdapter crashing and providing bad data on read when using JsonObject.
 - Fixed JsonAdapter sending unnecessary property changes for primitive values.
+- Fixed JsonAdapter serialization for lists.
 
 ## Packaging Changes
 
diff --git a/src/io/jsonadapter.cpp b/src/io/jsonadapter.cpp
index 9ca7060..df65120 100644
--- a/src/io/jsonadapter.cpp
+++ b/src/io/jsonadapter.cpp
@@ -1,5 +1,6 @@
 #include "jsonadapter.hpp"
 
+#include <qassociativeiterable.h>
 #include <qcontainerfwd.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
@@ -14,6 +15,7 @@
 #include <qqmlengine.h>
 #include <qqmlinfo.h>
 #include <qqmllist.h>
+#include <qsequentialiterable.h>
 #include <qstringview.h>
 #include <qvariant.h>
 
@@ -131,13 +133,16 @@ QJsonObject JsonAdapter::serializeRec(const QObject* obj, const QMetaObject* bas
 				}
 
 				json.insert(prop.name(), array);
-			} else if (val.canConvert<QJSValue>()) {
-				auto variant = val.value<QJSValue>().toVariant();
-				auto jv = QJsonValue::fromVariant(variant);
-				json.insert(prop.name(), jv);
 			} else {
-				auto jv = QJsonValue::fromVariant(val);
-				json.insert(prop.name(), jv);
+				if (val.canConvert<QJSValue>()) val = val.value<QJSValue>().toVariant();
+
+				if (val.canConvert<QAssociativeIterable>()) {
+					val.convert(QMetaType::fromType<QVariantMap>());
+				} else if (val.canConvert<QSequentialIterable>()) {
+					val.convert(QMetaType::fromType<QVariantList>());
+				}
+
+				json.insert(prop.name(), QJsonValue::fromVariant(val));
 			}
 		}
 	}