github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-31 03:50:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
soh/soh/Enhancements/Presets/Presets.cpp
View file

@ -193,23 +193,22 @@ 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();
} }
for (auto const& preset : fs::directory_iterator(presetFolder)) { if (fs::exists(presetFolder)) {
std::ifstream ifs(preset.path()); for (auto const& preset : fs::directory_iterator(presetFolder)) {
std::ifstream ifs(preset.path());
auto json = nlohmann::json::parse(ifs); auto json = nlohmann::json::parse(ifs);
if (!json.contains("presetName")) { if (!json.contains("presetName")) {
spdlog::error(fmt::format("Attempted to load file {} as a preset, but was not a preset file.", spdlog::error(fmt::format("Attempted to load file {} as a preset, but was not a preset file.",
preset.path().filename().string())); preset.path().filename().string()));
} else { } else {
ParsePreset(json, preset.path().filename().stem().string()); ParsePreset(json, preset.path().filename().stem().string());
}
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;