Skip to content

Commit

Permalink
SYNERGY-786 The system resets server name (#6961)
Browse files Browse the repository at this point in the history
* SYNERGY-786 The system resets server name

* Update ChangeLog

* Update job-test-windows.yml

* Update job-test-windows.yml

* Update codeql-analysis.yml

* Update codeql-analysis.yml
  • Loading branch information
SerhiiGadzhilov committed Mar 12, 2021
1 parent 54cb817 commit 2009409
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -18,8 +18,6 @@ on:
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '28 21 * * 0'

jobs:
analyze:
Expand Down Expand Up @@ -49,7 +47,7 @@ jobs:
# queries: ./path/to/local/query, your-org/your-repo/queries@main

- run: |
sudo sh -c 'export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -y && apt-get install -y \
sudo sh -c 'export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y \
git \
cmake \
qtbase5-dev \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/job-test-windows.yml
Expand Up @@ -34,7 +34,7 @@ jobs:
run: |
pip install aqtinstall
python -m aqt install --outputdir $env:QT_BASE_DIR --base $env:QT_BASE_URL $env:QT_VERSION windows desktop win64_msvc2017_64
cd $QT_LIB_DIR\msvc2017_64
cd $env:QT_LIB_DIR\msvc2017_64
dir
- name: Cache Bonjour
Expand All @@ -47,10 +47,10 @@ jobs:
- name: Install Bonjour SDK
if: steps.cache-bonjour.outputs.cache-hit != 'true'
run: |
New-Item -Force -ItemType Directory -Path $env:BONJOUR_BASE_DIR"
New-Item -Force -ItemType Directory -Path "$env:BONJOUR_BASE_DIR"
$client = new-object System.Net.WebClient
$client.DownloadFile("https://binaries.symless.com/bonjour/BonjourSDK.zip",".\bonjoursdk.zip")
[System.IO.Compression.ZipFile]::ExtractToDirectory(".\bonjoursdk.zip", $env:BONJOUR_BASE_DIR)
[System.IO.Compression.ZipFile]::ExtractToDirectory(".\bonjoursdk.zip", "$env:BONJOUR_BASE_DIR")
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2
Expand Down
2 changes: 1 addition & 1 deletion ChangeLog
@@ -1,7 +1,7 @@
v1.13.2-snapshot
===========
Bug fixes:
- #6953 The system does not update server name in Server configuration
- #6953 | #6961 The system does not update server name in Server configuration

Enhancements:
- #6954 Move language selection to advanced section
Expand Down
1 change: 1 addition & 0 deletions src/gui/src/ServerConfig.cpp
Expand Up @@ -145,6 +145,7 @@ void ServerConfig::saveSettings()

settings().endGroup();

m_pAppConfig->saveSettings();
//Tell the config writer there are changes
GUI::Config::ConfigWriter::make()->markUnsaved();
}
Expand Down

0 comments on commit 2009409

Please sign in to comment.