GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-07 12:49:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't check the content of repetier server name

Browse Source 
supermerill/SuperSlicer#1376
Also don't crash on identification error
This commit is contained in:
remi durand 2021-07-10 11:51:25 +02:00
parent 4d947212f4
commit d0c3cc5553
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/PhysicalPrinterDialog.cpp
View File

@ -271,6 +271,7 @@ void PhysicalPrinterDialog::update_printers()
wxArrayString printers; wxArrayString printers;
Field* rs = m_optgroup->get_field("printhost_port"); Field* rs = m_optgroup->get_field("printhost_port");
try {
if (!host->get_printers(printers)) { if (!host->get_printers(printers)) {
std::vector<std::string> slugs; std::vector<std::string> slugs;
@ -297,6 +298,9 @@ void PhysicalPrinterDialog::update_printers()
} }
rs->enable(); rs->enable();
} }
} catch (HostNetworkError error) {
show_error(this, error.what());
}
} }
void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgroup) void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgroup)

11
src/slic3r/Utils/Repetier.cpp
View File

@ -63,10 +63,13 @@ bool Repetier::test(wxString &msg) const
pt::ptree ptree; pt::ptree ptree;
pt::read_json(ss, ptree); pt::read_json(ss, ptree);
const auto text = ptree.get_optional<std::string>("name"); res = ptree.get_optional<std::string>("name").has_value();
res = validate_version_text(text); if (!res)
if (! res) { msg = GUI::from_u8((boost::format(_u8L("Can't process the repetier return message: missing field '%s'")) % ("name")).str());
msg = GUI::from_u8((boost::format(_u8L("Mismatched type of print host: %s")) % (text ? *text : "Repetier")).str()); else {
res = ptree.get_optional<std::string>("printers").has_value();
if (!res)
msg = GUI::from_u8((boost::format(_u8L("Can't process the repetier return message: missing field '%s'")) % ("printers")).str());
} }
} }
catch (const std::exception &) { catch (const std::exception &) {