3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bubnikv 2019-05-20 18:49:36 +02:00
commit fb6ae5296e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/UpdateDialogs.cpp
View File

@ -39,8 +39,7 @@ MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_on
ver_current(ver_current), ver_current(ver_current),
ver_online(ver_online) ver_online(ver_online)
{ {
const auto version = Semver::parse(SLIC3R_VERSION); const bool dev_version = ver_online.prerelease() != nullptr;
const bool dev_version = version->prerelease() != nullptr || boost::algorithm::ends_with(SLIC3R_BUILD_ID, "UNKNOWN");
auto *versions = new wxFlexGridSizer(2, 0, VERT_SPACING); auto *versions = new wxFlexGridSizer(2, 0, VERT_SPACING);
versions->Add(new wxStaticText(this, wxID_ANY, _(L("Current version:")))); versions->Add(new wxStaticText(this, wxID_ANY, _(L("Current version:"))));
@ -119,7 +118,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates) :
versions->Add(flex); versions->Add(flex);
if (! update.changelog_url.empty()) { if (! update.changelog_url.empty() && update.version.prerelease() == nullptr) {
auto *line = new wxBoxSizer(wxHORIZONTAL); auto *line = new wxBoxSizer(wxHORIZONTAL);
auto changelog_url = (boost::format(update.changelog_url) % lang_code).str(); auto changelog_url = (boost::format(update.changelog_url) % lang_code).str();
line->AddSpacer(3*VERT_SPACING); line->AddSpacer(3*VERT_SPACING);

4
xs/xsp/Print.xsp
View File

@ -165,7 +165,7 @@ _constant()
try { try {
THIS->process(); THIS->process();
} catch (std::exception& e) { } catch (std::exception& e) {
croak(e.what()); croak("%s\n", e.what());
} }
%}; %};
@ -173,7 +173,7 @@ _constant()
try { try {
THIS->export_gcode(path_template, nullptr); THIS->export_gcode(path_template, nullptr);
} catch (std::exception& e) { } catch (std::exception& e) {
croak(e.what()); croak("%s\n", e.what());
} }
%}; %};