From 2c4dd84d4986c71110f26c09c6a0ddfb0923f5f6 Mon Sep 17 00:00:00 2001
From: zhupengfei <zhupf321@gmail.com>
Date: Fri, 1 May 2020 15:05:01 +0800
Subject: [PATCH] Correctly load seeds

---
 src/core/importer.cpp     |  4 ++++
 src/core/ncch/seed_db.cpp | 10 +++-------
 src/core/ncch/seed_db.h   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/importer.cpp b/src/core/importer.cpp
index 7bfa426..ef8f73d 100644
--- a/src/core/importer.cpp
+++ b/src/core/importer.cpp
@@ -48,6 +48,10 @@ bool SDMCImporter::Init() {
         return false;
     }
 
+    if (!config.seed_db_path.empty()) {
+        Seeds::Load(config.seed_db_path);
+    }
+
     decryptor = std::make_unique<SDMCDecryptor>(config.sdmc_path);
 
     FileUtil::SetUserPath(config.user_path);
diff --git a/src/core/ncch/seed_db.cpp b/src/core/ncch/seed_db.cpp
index a5e57ba..aa7cb3d 100644
--- a/src/core/ncch/seed_db.cpp
+++ b/src/core/ncch/seed_db.cpp
@@ -119,17 +119,13 @@ namespace Seeds {
 static SeedDB g_seeddb;
 static bool g_seeddb_loaded = false;
 
-void Init(bool force) {
-    if (force || !g_seeddb_loaded) {
-        g_seeddb.Load(
-            fmt::format("{}/seeddb.bin", FileUtil::GetUserPath(FileUtil::UserPath::SysDataDir)));
-    }
-    g_seeddb_loaded = true;
+void Load(const std::string& path) {
+    g_seeddb_loaded = g_seeddb.Load(path);
 }
 
 std::optional<Seed::Data> GetSeed(u64 title_id) {
     if (!g_seeddb_loaded) {
-        Init();
+        Load(fmt::format("{}/seeddb.bin", FileUtil::GetUserPath(FileUtil::UserPath::SysDataDir)));
     }
     return g_seeddb.Get(title_id);
 }
diff --git a/src/core/ncch/seed_db.h b/src/core/ncch/seed_db.h
index 4305489..ea20480 100644
--- a/src/core/ncch/seed_db.h
+++ b/src/core/ncch/seed_db.h
@@ -53,7 +53,7 @@ private:
 
 namespace Seeds {
 
-void Init(bool force = false);
+void Load(const std::string& path);
 std::optional<Seed::Data> GetSeed(u64 title_id);
 
 } // namespace Seeds