From 8df6a89e6dd5aadf171c38f27745fb5bbe1b7000 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 4 Jun 2021 23:37:47 -0500
Subject: [PATCH] [ox/std] Fix Vector copy constructor not to move items

(synced from 33775f59ff1a34cb4c67066e4b2f9afd8d8e0d47)
---
 src/ox/model/desctypes.hpp | 13 +++++++++----
 src/ox/std/vector.hpp      |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ox/model/desctypes.hpp b/src/ox/model/desctypes.hpp
index 3d988cc4a..2ab8c25ca 100644
--- a/src/ox/model/desctypes.hpp
+++ b/src/ox/model/desctypes.hpp
@@ -82,19 +82,24 @@ struct DescriptorField {
 
 	~DescriptorField();
 
-	const DescriptorField &operator=(DescriptorField &&other) noexcept {
+	const DescriptorField &operator=(const DescriptorField &other) noexcept {
 		type = other.type;
 		fieldName = other.fieldName;
 		subscriptLevels = other.subscriptLevels;
 		typeName = other.typeName;
 		ownsType = other.ownsType;
+		return *this;
+	}
 
+	const DescriptorField &operator=(DescriptorField &&other) noexcept {
+		type = move(other.type);
 		other.type = {};
-		other.fieldName = "";
+		fieldName = move(other.fieldName);
+		subscriptLevels = move(other.subscriptLevels);
 		other.subscriptLevels = {};
-		other.typeName = "";
+		typeName = move(other.typeName);
+		ownsType = move(other.ownsType);
 		other.ownsType = {};
-
 		return *this;
 	}
 
diff --git a/src/ox/std/vector.hpp b/src/ox/std/vector.hpp
index f093d0a39..8190e0659 100644
--- a/src/ox/std/vector.hpp
+++ b/src/ox/std/vector.hpp
@@ -301,7 +301,7 @@ Vector<T, SmallVectorSize>::Vector(const Vector &other) {
 	m_cap = other.m_cap;
 	this->initItems(&m_items, other.m_cap);
 	for (std::size_t i = 0; i < m_size; ++i) {
-		m_items[i] = move(other.m_items[i]);
+		m_items[i] = other.m_items[i];
 	}
 }