diff options
author | bubnikv <bubnikv@gmail.com> | 2019-05-20 19:49:36 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2019-05-20 19:49:36 +0300 |
commit | fb6ae5296e45e8d4383807dbf1c1c8d49fa4236d (patch) | |
tree | 283e20f550553bac15cecc55f96864312a89622d | |
parent | 45a2ced191e6d43f99095a392f5d76713b0b9127 (diff) | |
parent | 28d28a54bffb39d857c2626088433487c6dd3046 (diff) |
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicerversion_2.0.0
-rw-r--r-- | src/slic3r/GUI/UpdateDialogs.cpp | 5 | ||||
-rw-r--r-- | xs/xsp/Print.xsp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index a4f696fb8..0f72b3b35 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -39,8 +39,7 @@ MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_on ver_current(ver_current), ver_online(ver_online) { - const auto version = Semver::parse(SLIC3R_VERSION); - const bool dev_version = version->prerelease() != nullptr || boost::algorithm::ends_with(SLIC3R_BUILD_ID, "UNKNOWN"); + const bool dev_version = ver_online.prerelease() != nullptr; auto *versions = new wxFlexGridSizer(2, 0, VERT_SPACING); versions->Add(new wxStaticText(this, wxID_ANY, _(L("Current version:")))); @@ -119,7 +118,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates) : versions->Add(flex); - if (! update.changelog_url.empty()) { + if (! update.changelog_url.empty() && update.version.prerelease() == nullptr) { auto *line = new wxBoxSizer(wxHORIZONTAL); auto changelog_url = (boost::format(update.changelog_url) % lang_code).str(); line->AddSpacer(3*VERT_SPACING); diff --git a/xs/xsp/Print.xsp b/xs/xsp/Print.xsp index b8662dcd8..f4c04577d 100644 --- a/xs/xsp/Print.xsp +++ b/xs/xsp/Print.xsp @@ -165,7 +165,7 @@ _constant() try { THIS->process(); } catch (std::exception& e) { - croak(e.what()); + croak("%s\n", e.what()); } %}; @@ -173,7 +173,7 @@ _constant() try { THIS->export_gcode(path_template, nullptr); } catch (std::exception& e) { - croak(e.what()); + croak("%s\n", e.what()); } %}; |