diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 8163c9eed1..f0b479d733 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -6690,15 +6690,6 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage { wxCHECK_MSG(mainframe != nullptr, false, "Internal error: Main frame not created / null"); - //if (reason == ConfigWizard::RR_USER) { - // //TODO: turn off it currently, maybe need to turn on in the future - // if (preset_updater->config_update(app_config->orig_version(), PresetUpdater::UpdateParams::FORCED_BEFORE_WIZARD) == PresetUpdater::R_ALL_CANCELED) - // return false; - //} - - //auto wizard_t = new ConfigWizard(mainframe); - //const bool res = wizard_t->run(reason, start_page); - std::string strFinish = wxGetApp().app_config->get("firstguide", "finish"); long pStyle = wxCAPTION | wxCLOSE_BOX | wxSYSTEM_MENU; if (strFinish == "false" || strFinish.empty()) diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp index e222f3cb5e..fcf0491eea 100644 --- a/src/slic3r/Utils/PresetUpdater.cpp +++ b/src/slic3r/Utils/PresetUpdater.cpp @@ -795,7 +795,7 @@ void PresetUpdater::priv::sync_update_flutter_resource(bool isAuto_check) if (currentSoftVersion > maxSpVersion || currentSoftVersion < minSpVersion) { if (!isAuto_check) { - wxCommandEvent* evt = new wxCommandEvent(EVT_NO_PRESET_UPDATE); + wxCommandEvent* evt = new wxCommandEvent(EVT_NO_WEB_RESOURCE_UPDATE); GUI::wxGetApp().QueueEvent(evt); BOOST_LOG_TRIVIAL(info) << format("use check the web update."); @@ -1851,7 +1851,7 @@ void PresetUpdater::load_lutter_web(const std::string& zip_file, bool serverUpda Semver online_version = version_str; Semver current_version = ori_version_str; - if (/* current_version < online_version && */ ori_build_number_str < build_number_str) { + if (current_version < online_version) { auto source_folder_path = fs::path(dir_entry.path().parent_path()); auto target_folder_path = (boost::filesystem::path(data_dir()) / "web" / "flutter_web");