Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVojtech Kral <vojtech@kral.hk>2019-05-20 19:36:11 +0300
committerVojtech Kral <vojtech@kral.hk>2019-05-20 19:36:55 +0300
commit28d28a54bffb39d857c2626088433487c6dd3046 (patch)
tree13dbba7f7d6a09a010fefbabeab8b6736d3ac725
parent58d78e8dbdafae1e4b459fe4e439021796a87fcf (diff)
Preset updating: Judge dev version based on version online, not current
-rw-r--r--src/slic3r/GUI/UpdateDialogs.cpp5
1 files changed, 2 insertions, 3 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);