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

Fixed a crash when "resources/shapes" directory doesn't exist.

Browse source 
+ Localization for the "Internal error: %1%" in generic_exception_handle()
This commit is contained in:
YuSanka 2021-07-15 09:04:12 +02:00
parent d7205c9461
commit 0220ae4ce5
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -608,7 +608,7 @@ static void generic_exception_handle()
std::terminate(); std::terminate();
throw; throw;
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
wxLogError("Internal error: %s", wxString::FromUTF8(ex.what())); wxLogError(format_wxstr(_L("Internal error: %1%"), ex.what()));
BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what(); BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what();
throw; throw;
} }

9
src/slic3r/GUI/GalleryDialog.cpp
View file

@ -219,11 +219,6 @@ static fs::path get_dir(bool sys_dir)
return fs::absolute(fs::path(data_dir()) / "shapes").make_preferred(); return fs::absolute(fs::path(data_dir()) / "shapes").make_preferred();
} }
static bool custom_exists()
{
return fs::exists(get_dir(false));
}
static std::string get_dir_path(bool sys_dir) static std::string get_dir_path(bool sys_dir)
{ {
fs::path dir = get_dir(sys_dir); fs::path dir = get_dir(sys_dir);
@ -299,6 +294,9 @@ void GalleryDialog::load_label_icon_list()
auto add_files_from_gallery = [](std::vector<Item>& items, bool sys_dir, std::string& dir_path) auto add_files_from_gallery = [](std::vector<Item>& items, bool sys_dir, std::string& dir_path)
{ {
fs::path dir = get_dir(sys_dir); fs::path dir = get_dir(sys_dir);
if (!fs::exists(dir))
return;
dir_path = get_dir_path(sys_dir); dir_path = get_dir_path(sys_dir);
std::vector<std::string> sorted_names; std::vector<std::string> sorted_names;
@ -319,7 +317,6 @@ void GalleryDialog::load_label_icon_list()
std::string m_sys_dir_path, m_cust_dir_path; std::string m_sys_dir_path, m_cust_dir_path;
std::vector<Item> list_items; std::vector<Item> list_items;
add_files_from_gallery(list_items, true, m_sys_dir_path); add_files_from_gallery(list_items, true, m_sys_dir_path);
if (custom_exists())
add_files_from_gallery(list_items, false, m_cust_dir_path); add_files_from_gallery(list_items, false, m_cust_dir_path);
// Make an image list containing large icons // Make an image list containing large icons