3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 15:37:30 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Automatically recover from corrupted config file

Browse source
This commit is contained in:
SoftFever 2023-11-09 22:09:41 +08:00
parent df0a49a73d
commit 22abe8cc9d
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2122,16 +2122,15 @@ void GUI_App::init_app_config()
app_config = new AppConfig(); app_config = new AppConfig();
//app_config = new AppConfig(is_editor() ? AppConfig::EAppMode::Editor : AppConfig::EAppMode::GCodeViewer); //app_config = new AppConfig(is_editor() ? AppConfig::EAppMode::Editor : AppConfig::EAppMode::GCodeViewer);
m_config_corrupted = false;
// load settings // load settings
m_app_conf_exists = app_config->exists(); m_app_conf_exists = app_config->exists();
if (m_app_conf_exists) { if (m_app_conf_exists) {
std::string error = app_config->load(); std::string error = app_config->load();
if (!error.empty()) { if (!error.empty()) {
// Error while parsing config file. We'll customize the error message and rethrow to be displayed. // Orca: if the config file is corrupted, we will show a error dialog and create a default config file.
throw Slic3r::RuntimeError( m_config_corrupted = true;
_u8L("OrcaSlicer configuration file may be corrupted and is not abled to be parsed."
"Please delete the file and try again.") +
"\n\n" + app_config->config_path() + "\n\n" + error);
} }
// Save orig_version here, so its empty if no app_config existed before this run. // Save orig_version here, so its empty if no app_config existed before this run.
m_last_config_version = app_config->orig_version();//parse_semver_from_ini(app_config->config_path()); m_last_config_version = app_config->orig_version();//parse_semver_from_ini(app_config->config_path());
@ -2748,6 +2747,7 @@ bool GUI_App::on_init_inner()
if (m_post_initialized && app_config->dirty()) if (m_post_initialized && app_config->dirty())
app_config->save(); app_config->save();
}); });
m_initialized = true; m_initialized = true;
@ -2755,6 +2755,13 @@ bool GUI_App::on_init_inner()
flush_logs(); flush_logs();
BOOST_LOG_TRIVIAL(info) << "finished the gui app init"; BOOST_LOG_TRIVIAL(info) << "finished the gui app init";
if (m_config_corrupted) {
m_config_corrupted = false;
show_error(nullptr,
_u8L(
"The OrcaSlicer configuration file may be corrupted and cannot be parsed.\nOrcaSlicer has attempted to recreate the "
"configuration file.\nPlease note, application settings will be lost, but printer profiles will not be affected."));
}
//BBS: delete splash screen //BBS: delete splash screen
delete scrn; delete scrn;
return true; return true;

1
src/slic3r/GUI/GUI_App.hpp
View file

@ -656,6 +656,7 @@ private:
bool m_datadir_redefined { false }; bool m_datadir_redefined { false };
std::string m_older_data_dir_path; std::string m_older_data_dir_path;
boost::optional<Semver> m_last_config_version; boost::optional<Semver> m_last_config_version;
bool m_config_corrupted { false };
}; };
DECLARE_APP(GUI_App) DECLARE_APP(GUI_App)