fix pack fromjson not doing error handling

geode-sdk · Nov 15, 2024 · 2258944 · 2258944
1 parent 17c66f0
commit 2258944
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/mod.json b/mod.json
@@ -1,6 +1,6 @@
 {
 	"geode": "4.0.0-alpha.1",
-	"version": "v1.6.4",
+	"version": "v1.6.5",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",

diff --git a/src/Pack.cpp b/src/Pack.cpp
@@ -215,7 +215,7 @@ Pack::~Pack() {
 Result<std::shared_ptr<Pack>> Pack::from(std::filesystem::path const& dir) {
     #ifdef GEODE_IS_WINDOWS
     try {
-        auto test = dir.filename().string();
+        (void) dir.filename().string();
     } catch(const std::exception& e) {
         return Err("Invalid path");
     }
@@ -237,5 +237,7 @@ matjson::Value matjson::Serialize<std::shared_ptr<Pack>>::toJson(std::shared_ptr
 }
 
 Result<std::shared_ptr<Pack>> matjson::Serialize<std::shared_ptr<Pack>>::fromJson(matjson::Value const& value) {
-    return Ok(Pack::from(value["path"].as<std::filesystem::path>().unwrap()).unwrap());
+    GEODE_UNWRAP_INTO(auto path, value["path"].as<std::filesystem::path>());
+    GEODE_UNWRAP_INTO(auto pack, Pack::from(path));
+    return Ok(pack);
 }