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

Fix: fix the user directory not found issue 

wrongly delete by update_user_presets_directory with empty username

Change-Id: I88521cddde5db5aeaccdbc62b09db74f5f596fbe
This commit is contained in:
lane.wei 2022-10-18 21:34:48 +08:00 committed by Lane.Wei
parent 6635e57c36
commit 0693f8c8c6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libslic3r/PresetBundle.cpp
View File

@ -726,6 +726,11 @@ void PresetBundle::update_user_presets_directory(const std::string preset_folder
const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/"+ preset_folder; const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/"+ preset_folder;
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, update directory to %1%")%dir_user_presets; BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, update directory to %1%")%dir_user_presets;
fs::path user_folder(data_dir() + "/" + PRESET_USER_DIR);
if (!fs::exists(user_folder))
fs::create_directory(user_folder);
fs::path folder(dir_user_presets); fs::path folder(dir_user_presets);
if (!fs::exists(folder)) if (!fs::exists(folder))
fs::create_directory(folder); fs::create_directory(folder);
@ -740,6 +745,10 @@ void PresetBundle::remove_user_presets_directory(const std::string preset_folder
{ {
const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/" + preset_folder; const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/" + preset_folder;
if (preset_folder.empty()) {
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": preset_folder is empty, no need to remove directory : %1%") % dir_user_presets;
return;
}
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, delete directory : %1%") % dir_user_presets; BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, delete directory : %1%") % dir_user_presets;
fs::path folder(dir_user_presets); fs::path folder(dir_user_presets);
if (fs::exists(folder)) { if (fs::exists(folder)) {