nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Preset List with no customs available (#5535)

Browse Source 
* Surround preset file processing with the fs::exists check rather than returning early.

* clang
This commit is contained in:
Malkierian
2025-05-27 13:19:14 -07:00
committed by GitHub
parent 4e8e6d2313
commit fa6f45bde5
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
soh/soh/Enhancements/Presets/Presets.cpp
View File

@@ -193,12 +193,10 @@ void ParsePreset(nlohmann::json& json, std::string name) {
} }
void LoadPresets() { void LoadPresets() {
if (!fs::exists(presetFolder)) {
return;
}
if (!presets.empty()) { if (!presets.empty()) {
presets.clear(); presets.clear();
} }
if (fs::exists(presetFolder)) {
for (auto const& preset : fs::directory_iterator(presetFolder)) { for (auto const& preset : fs::directory_iterator(presetFolder)) {
std::ifstream ifs(preset.path()); std::ifstream ifs(preset.path());
@@ -211,6 +209,7 @@ void LoadPresets() {
} }
ifs.close(); ifs.close();
} }
}
auto initData = std::make_shared<Ship::ResourceInitData>(); auto initData = std::make_shared<Ship::ResourceInitData>();
initData->Format = RESOURCE_FORMAT_BINARY; initData->Format = RESOURCE_FORMAT_BINARY;
initData->Type = static_cast<uint32_t>(Ship::ResourceType::Json); initData->Type = static_cast<uint32_t>(Ship::ResourceType::Json);