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

Disable the dialog before merge with master

Browse Source
This commit is contained in:
Lukas Matena 2021-10-05 15:08:04 +02:00
parent d7d056c8ba
commit deec0330bb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/SendSystemInfoDialog.cpp
View File

@ -129,14 +129,16 @@ public:
// current version is newer. Only major and minor versions are compared. // current version is newer. Only major and minor versions are compared.
static bool should_dialog_be_shown() static bool should_dialog_be_shown()
{ {
return false;
std::string last_sent_version = wxGetApp().app_config->get("version_system_info_sent"); std::string last_sent_version = wxGetApp().app_config->get("version_system_info_sent");
Semver semver_current(SLIC3R_VERSION); Semver semver_current(SLIC3R_VERSION);
Semver semver_last_sent; Semver semver_last_sent;
if (! last_sent_version.empty()) if (! last_sent_version.empty())
semver_last_sent = Semver(last_sent_version); semver_last_sent = Semver(last_sent_version);
if (semver_current.prerelease() && std::string(semver_current.prerelease()) != "rc") if (semver_current.prerelease() && std::string(semver_current.prerelease()) == "alpha")
return false; // Only show in rcs / finals. return false; // Don't show in alphas.
// Show the dialog if current > last, but they differ in more than just patch. // Show the dialog if current > last, but they differ in more than just patch.
return ((semver_current.maj() > semver_last_sent.maj()) return ((semver_current.maj() > semver_last_sent.maj())