mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: clean preset_folder when logging out 

Change-Id: I0a61db6b6ae0fc4bad1f178e1492384a42de1501
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-11-03 14:41:00 +08:00 committed by Lane.Wei
parent d950c1d323
commit 239f7e3e32
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/PresetBundle.cpp
View File

@ -250,7 +250,7 @@ PresetsConfigSubstitutions PresetBundle::load_presets(AppConfig &config, Forward
dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/" + config.get("preset_folder");
}
else {
dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/default";
dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/" + DEFAULT_USER_FOLDER_NAME;
}
fs::path user_folder(data_dir() + "/" + PRESET_USER_DIR);
if (!fs::exists(user_folder))
@ -700,8 +700,11 @@ PresetsConfigSubstitutions PresetBundle::import_presets(std::vector<std::string>
//BBS save user preset to user_id preset folder
void PresetBundle::save_user_presets(AppConfig& config, std::vector<std::string>& need_to_delete_list)
{
std::string user_sub_folder = DEFAULT_USER_FOLDER_NAME;
if (!config.get("preset_folder").empty())
user_sub_folder = config.get("preset_folder");
//BBS: change directory by design
const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/"+ config.get("preset_folder");
const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/"+ user_sub_folder;
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, save to %1%")%dir_user_presets;

2
src/libslic3r/PresetBundle.hpp
View File

@ -9,6 +9,8 @@
#include <unordered_map>
#include <boost/filesystem/path.hpp>
#define DEFAULT_USER_FOLDER_NAME "default"
namespace Slic3r {
// Bundle of Print + Filament + Printer presets.

1
src/slic3r/GUI/GUI_App.cpp
View File

@ -3096,6 +3096,7 @@ void GUI_App::request_user_logout()
m_agent->user_logout();
m_agent->set_user_selected_machine("");
app_config->set("preset_folder", "");
/* delete old user settings */
m_device_manager->clean_user_info();
GUI::wxGetApp().sidebar().load_ams_list({});