amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed previous commit

Browse source
This commit is contained in:
Vojtech Bubnik 2021-12-15 14:52:01 +01:00
parent 5ba9d59307
commit b2bcf17dfa
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/Config/Snapshot.cpp
View file

@ -590,7 +590,7 @@ bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot:
{ {
try { try {
const Snapshot *snapshot = &SnapshotDB::singleton().take_snapshot(app_config, reason, comment); const Snapshot *snapshot = &SnapshotDB::singleton().take_snapshot(app_config, reason, comment);
if (*psnapshot) if (psnapshot)
*psnapshot = snapshot; *psnapshot = snapshot;
return true; return true;
} catch (std::exception &err) { } catch (std::exception &err) {

2
src/slic3r/GUI/GUI_App.cpp
View file

@ -979,7 +979,7 @@ std::string GUI_App::check_older_app_config(Semver current_version, bool backup)
if (backup) { if (backup) {
const Config::Snapshot* snapshot{ nullptr }; const Config::Snapshot* snapshot{ nullptr };
if (! GUI::Config::take_config_snapshot_cancel_on_error(*app_config, Config::Snapshot::SNAPSHOT_USER, "", if (! GUI::Config::take_config_snapshot_cancel_on_error(*app_config, Config::Snapshot::SNAPSHOT_USER, "",
_u8L("Continue and import newer configuration?")), &snapshot) _u8L("Continue and import newer configuration?"), &snapshot))
return {}; return {};
if (snapshot) { if (snapshot) {
// Save snapshot ID before loading the alternate AppConfig, as loading the alternate AppConfig may fail. // Save snapshot ID before loading the alternate AppConfig, as loading the alternate AppConfig may fail.