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

Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer

Browse source
This commit is contained in:
bubnikv 2019-08-27 11:49:52 +02:00
commit 3dff253b64
6 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,9 +139,6 @@ static void generic_exception_handle()
wxLogError("Internal error: %s", ex.what());
BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what();
throw;
} catch (...) {
wxLogError("Unknown internal error");
BOOST_LOG_TRIVIAL(error) << "Uncaught exception: Unknown error";
}
}
@ -169,7 +166,7 @@ bool GUI_App::OnInit()
{
try {
return on_init_inner();
} catch (...) {
} catch (const std::exception&) {
generic_exception_handle();
return false;
}

1
src/slic3r/GUI/PresetBundle.cpp
View file

@ -445,6 +445,7 @@ DynamicPrintConfig PresetBundle::full_config() const
DynamicPrintConfig PresetBundle::full_config_secure() const
{
DynamicPrintConfig config = this->full_config();
config.erase("print_host");
config.erase("printhost_apikey");
config.erase("printhost_cafile");
return config;

4
src/slic3r/GUI/UpdateDialogs.cpp
View file

@ -113,7 +113,9 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates) :
if (! update.comment.empty()) {
flex->Add(new wxStaticText(this, wxID_ANY, _(L("Comment:"))), 0, wxALIGN_RIGHT);
flex->Add(new wxStaticText(this, wxID_ANY, from_u8(update.comment)));
auto *update_comment = new wxStaticText(this, wxID_ANY, from_u8(update.comment));
update_comment->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
flex->Add(update_comment);
}
versions->Add(flex);