GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-29 04:33:13 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

ENH: version: refine file version process logic

Browse Source 
only compare minor version when major equals
jira: no-jira

Change-Id: I0159c1b15db30238ad05b8ff7c83f6668fd11ac2
This commit is contained in:
lane.wei 2024-12-05 21:33:26 +08:00
parent c4ef6e9e09
commit e50e698592
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BambuStudio.cpp
View File

@ -1678,7 +1678,7 @@ int CLI::run(int argc, char **argv)
}*/
Semver cli_ver = *Semver::parse(SLIC3R_VERSION);
if (!allow_newer_file && ((cli_ver.maj() != file_version.maj()) || (cli_ver.min() < file_version.min()))){
if (!allow_newer_file && ((cli_ver.maj() < file_version.maj()) || ((cli_ver.maj() == file_version.maj()) && (cli_ver.min() < file_version.min())))){
BOOST_LOG_TRIVIAL(error) << boost::format("Version Check: File Version %1% not supported by current cli version %2%")%file_version.to_string() %SLIC3R_VERSION;
record_exit_reson(outfile_dir, CLI_FILE_VERSION_NOT_SUPPORTED, 0, cli_errors[CLI_FILE_VERSION_NOT_SUPPORTED], sliced_info);
flush_and_exit(CLI_FILE_VERSION_NOT_SUPPORTED);

3
src/slic3r/GUI/Plater.cpp
View File

@ -4366,7 +4366,8 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
// Is there any modifier or advanced config data?
for (ModelVolume *model_volume : model_object->volumes) model_volume->config.reset();
}
} else if (load_config && (file_version > app_version)) {
}
else if (load_config && (file_version.maj() == app_version.maj()) && (file_version.min() > app_version.min())) {
Semver cloud_ver;
if (wxGetApp().app_config->has("app", "cloud_version")) {
std::string cloud_version = wxGetApp().app_config->get("app", "cloud_version");