Skip to content

Commit

Permalink
Minor fixes continued
Browse files Browse the repository at this point in the history
  • Loading branch information
SoftFever committed Aug 27, 2023
1 parent 17811c9 commit ea46af8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ jobs:
# Thanks to RaySajuuk, it's working now
- name: Notarize the app
if: matrix.os == 'macos-12'
if: github.ref == 'refs/heads/main' && matrix.os == 'macos-12'
working-directory: ${{ github.workspace }}
run: |
xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
Expand Down
15 changes: 4 additions & 11 deletions src/slic3r/GUI/GUI_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4467,17 +4467,7 @@ std::string GUI_App::format_display_version()
{
if (!version_display.empty()) return version_display;

auto version_text = std::string(SLIC3R_VERSION);
int len = version_text.length();
for (int i = 0, j = 0; i < len; ++i) {
if (!(version_text[i] == '0' && j == 0))
version_display += version_text[i];

if (version_text[i] == '.')
j = 0;
else
++j;
}
version_display = SoftFever_VERSION;
return version_display;
}

Expand Down Expand Up @@ -4626,6 +4616,9 @@ void GUI_App::sync_preset(Preset* preset)

void GUI_App::start_sync_user_preset(bool with_progress_dlg)
{
if (app_config->get("stealth_mode") == "true")
return;

if (!m_agent || !m_agent->is_user_login()) return;

// has already start sync
Expand Down
2 changes: 1 addition & 1 deletion version.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(SLIC3R_APP_NAME "OrcaSlicer")
set(SLIC3R_APP_KEY "OrcaSlicer")

if(NOT DEFINED BBL_RELEASE_TO_PUBLIC)
set(BBL_RELEASE_TO_PUBLIC "0")
set(BBL_RELEASE_TO_PUBLIC "1")
endif()
if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1")
Expand Down

0 comments on commit ea46af8

Please sign in to comment.