diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-01 13:38:32 -0700 |
|---|---|---|
| committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-01 17:03:11 -0700 |
| commit | 2a5d291bd940ea61b8254eb78b478ae86ed17f59 (patch) | |
| tree | 1c5ccfa495c4393a540e7097f52c63b7402f746b | |
| parent | e2a65a70779a66471d98a98a1cc611fcb9bb0d5b (diff) | |
| download | PrismLauncher-2a5d291bd940ea61b8254eb78b478ae86ed17f59.tar.gz PrismLauncher-2a5d291bd940ea61b8254eb78b478ae86ed17f59.tar.bz2 PrismLauncher-2a5d291bd940ea61b8254eb78b478ae86ed17f59.zip | |
fix: toml without exceptions usage
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
| -rw-r--r-- | launcher/minecraft/mod/tasks/LocalModParseTask.cpp | 7 | ||||
| -rw-r--r-- | launcher/modplatform/packwiz/Packwiz.cpp | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp index 264019f8..f8d454cf 100644 --- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp +++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp @@ -104,14 +104,15 @@ ModDetails ReadMCModTOML(QByteArray contents) #if TOML_EXCEPTIONS try { tomlData = toml::parse(contents.toStdString()); - } catch (const toml::parse_error& err) { + } catch ([[maybe_unused]] const toml::parse_error& err) { return {}; } #else - tomlData = toml::parse(contents.toStdString()); - if (!tomlData) { + toml::parse_result result = toml::parse(contents.toStdString()); + if (!result) { return {}; } + tomlData = result.table(); #endif // array defined by [[mods]] diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp index 510c7309..967b8870 100644 --- a/launcher/modplatform/packwiz/Packwiz.cpp +++ b/launcher/modplatform/packwiz/Packwiz.cpp @@ -241,12 +241,13 @@ auto V1::getIndexForMod(QDir& index_dir, QString slug) -> Mod return {}; } #else - table = toml::parse_file(StringUtils::toStdString(index_dir.absoluteFilePath(real_fname))); - if (!table) { + toml::parse_result result = toml::parse_file(StringUtils::toStdString(index_dir.absoluteFilePath(real_fname))); + if (!result) { qWarning() << QString("Could not open file %1!").arg(normalized_fname); - qWarning() << "Reason: " << QString(table.error().what()); + qWarning() << "Reason: " << result.error().description(); return {}; } + table = result.table(); #endif // index_file.close(); |