From bd2aeee276b7560e1f76cf4cb9345e5c2c646125 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 30 Dec 2023 13:57:51 -0600 Subject: [PATCH] [ox/claw] Improve error clarity when loading ModelObjects --- deps/ox/src/ox/claw/read.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deps/ox/src/ox/claw/read.cpp b/deps/ox/src/ox/claw/read.cpp index 3d2d834a..e62c7e87 100644 --- a/deps/ox/src/ox/claw/read.cpp +++ b/deps/ox/src/ox/claw/read.cpp @@ -74,7 +74,10 @@ Result stripClawHeader(const ox::Buffer &buff) noexcept { Result readClaw(TypeStore &ts, const char *buff, std::size_t buffSz) noexcept { oxRequire(header, readClawHeader(buff, buffSz)); - oxRequire(t, ts.getLoad(header.typeName, header.typeVersion, header.typeParams)); + auto const [t, tdErr] = ts.getLoad(header.typeName, header.typeVersion, header.typeParams); + if (tdErr) { + return OxError(3, "Could not load type descriptor"); + } ModelObject obj; oxReturnError(obj.setType(t)); switch (header.fmt) {