Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20996: Improves version incompatibility error message #186

Merged
merged 2 commits into from
Jul 22, 2024
Merged

20996: Improves version incompatibility error message #186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbc6e33
20996: Improves version incompatibility message
fulpm Jul 22, 2024
6e35f9b
Merge branch 'main' into 20996-update-version-error
howsohazard Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Amalgam/AssetManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,13 +338,13 @@ std::pair<std::string, bool> AssetManager::ValidateVersionAgainstAmalgam(std::st
(major == AMALGAM_VERSION_MAJOR && minor > AMALGAM_VERSION_MINOR) ||
(major == AMALGAM_VERSION_MAJOR && minor == AMALGAM_VERSION_MINOR && patch > AMALGAM_VERSION_PATCH))
{
std::string err_msg = "Reading newer version not supported";
std::string err_msg = "Parsing Amalgam that is more recent than the current version is not supported";
std::cerr << err_msg << ", version=" << version << std::endl;
return std::make_pair(err_msg, false);
}
else if(AMALGAM_VERSION_MAJOR > major)
{
std::string err_msg = "Newer Amalgam cannot read older versions";
std::string err_msg = "Parsing Amalgam that is older than the current major version is not supported";
std::cerr << err_msg << ", version=" << version << std::endl;
return std::make_pair(err_msg, false);
}
Expand Down
Loading