Fixed previous commit
This commit is contained in:
parent
5ba9d59307
commit
b2bcf17dfa
2 changed files with 2 additions and 2 deletions
|
@ -590,7 +590,7 @@ bool take_config_snapshot_cancel_on_error(const AppConfig &app_config, Snapshot:
|
|||
{
|
||||
try {
|
||||
const Snapshot *snapshot = &SnapshotDB::singleton().take_snapshot(app_config, reason, comment);
|
||||
if (*psnapshot)
|
||||
if (psnapshot)
|
||||
*psnapshot = snapshot;
|
||||
return true;
|
||||
} catch (std::exception &err) {
|
||||
|
|
|
@ -979,7 +979,7 @@ std::string GUI_App::check_older_app_config(Semver current_version, bool backup)
|
|||
if (backup) {
|
||||
const Config::Snapshot* snapshot{ nullptr };
|
||||
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 {};
|
||||
if (snapshot) {
|
||||
// Save snapshot ID before loading the alternate AppConfig, as loading the alternate AppConfig may fail.
|
||||
|
|
Loading…
Reference in a new issue