Merge commit '30e274c993f4b90acd087c7297364fb3e0decc01' into develop

airdcpp-web · Aug 23, 2024 · 72e8c46 · 72e8c46
2 parents 8917a3f + 30e274c
commit 72e8c46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/airdcpp-webapi/api/QueueApi.cpp b/airdcpp-webapi/api/QueueApi.cpp
@@ -187,7 +187,7 @@ namespace webserver {
 						{ "name", aData.name },
 						{ "time", aData.date },
 						{ "priority", Serializer::serializePriorityId(aData.prio) },
-						{ "type", aIsFile ? Serializer::serializeFileType(aData.name) : Serializer::serializeFolderType(DirectoryContentInfo()) },
+						{ "type", aIsFile ? Serializer::serializeFileType(aData.name) : Serializer::serializeFolderType(DirectoryContentInfo::uninitialized()) },
 					} },
 				});
 			}),

diff --git a/airdcpp-webapi/api/ShareApi.cpp b/airdcpp-webapi/api/ShareApi.cpp
@@ -201,7 +201,7 @@ namespace webserver {
 	}
 
 	json ShareApi::serializeDirectory(const ShareDirectory::Ptr& aDirectory) noexcept {
-		DirectoryContentInfo contentInfo;
+		auto contentInfo(DirectoryContentInfo::empty());
 		int64_t totalSize = 0;
 		aDirectory->getContentInfo(totalSize, contentInfo);
 

diff --git a/airdcpp-webapi/api/common/Serializer.cpp b/airdcpp-webapi/api/common/Serializer.cpp
@@ -396,7 +396,7 @@ namespace webserver {
 		};
 
 		if (aInfo.isDirectory) {
-			ret["type"] = Serializer::serializeFolderType(DirectoryContentInfo());
+			ret["type"] = Serializer::serializeFolderType(DirectoryContentInfo::uninitialized());
 		} else {
 			ret["type"] = Serializer::serializeFileType(aInfo.name);
 			ret["size"] = aInfo.size;