Merge branch 'dk_config'

This commit is contained in:
David Kocik 2020-02-05 12:45:44 +01:00
commit 295f57001c

View File

@ -538,6 +538,8 @@ Updates PresetUpdater::priv::get_config_updates(const Semver &old_slic3r_version
} }
// Check if the update is already present in a snapshot // Check if the update is already present in a snapshot
if(!current_not_supported)
{
const auto recommended_snap = SnapshotDB::singleton().snapshot_with_vendor_preset(vp.name, recommended->config_version); const auto recommended_snap = SnapshotDB::singleton().snapshot_with_vendor_preset(vp.name, recommended->config_version);
if (recommended_snap != SnapshotDB::singleton().end()) { if (recommended_snap != SnapshotDB::singleton().end()) {
BOOST_LOG_TRIVIAL(info) << boost::format("Bundle update %1% %2% already found in snapshot %3%, skipping...") BOOST_LOG_TRIVIAL(info) << boost::format("Bundle update %1% %2% already found in snapshot %3%, skipping...")
@ -546,6 +548,7 @@ Updates PresetUpdater::priv::get_config_updates(const Semver &old_slic3r_version
% recommended_snap->id; % recommended_snap->id;
continue; continue;
} }
}
updates.updates.emplace_back(std::move(new_update)); updates.updates.emplace_back(std::move(new_update));
// 'Install' the index in the vendor directory. This is used to memoize // 'Install' the index in the vendor directory. This is used to memoize