smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SYNERGY-786 The system resets server name (#6961)

Browse source 
* 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
This commit is contained in:
SerhiiGadzhilov 2021-03-12 20:09:30 +02:00 committed by GitHub
parent 54cb817de8
commit 2009409c14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/codeql-analysis.yml vendored
View file

@ -18,8 +18,6 @@ on:
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [ master ] branches: [ master ]
schedule:
- cron: '28 21 * * 0'
jobs: jobs:
analyze: analyze:
@ -49,7 +47,7 @@ jobs:
# queries: ./path/to/local/query, your-org/your-repo/queries@main # queries: ./path/to/local/query, your-org/your-repo/queries@main
- run: | - 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 \ git \
cmake \ cmake \
qtbase5-dev \ qtbase5-dev \

6
.github/workflows/job-test-windows.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
run: | run: |
pip install aqtinstall 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 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 dir
- name: Cache Bonjour - name: Cache Bonjour
@ -47,10 +47,10 @@ jobs:
- name: Install Bonjour SDK - name: Install Bonjour SDK
if: steps.cache-bonjour.outputs.cache-hit != 'true' if: steps.cache-bonjour.outputs.cache-hit != 'true'
run: | 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 = new-object System.Net.WebClient
$client.DownloadFile("https://binaries.symless.com/bonjour/BonjourSDK.zip",".\bonjoursdk.zip") $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 - name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2 uses: microsoft/setup-msbuild@v1.0.2

2
ChangeLog
View file

@ -1,7 +1,7 @@
v1.13.2-snapshot v1.13.2-snapshot
=========== ===========
Bug fixes: 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: Enhancements:
- #6954 Move language selection to advanced section - #6954 Move language selection to advanced section

1
src/gui/src/ServerConfig.cpp
View file

@ -145,6 +145,7 @@ void ServerConfig::saveSettings()
settings().endGroup(); settings().endGroup();
m_pAppConfig->saveSettings();
//Tell the config writer there are changes //Tell the config writer there are changes
GUI::Config::ConfigWriter::make()->markUnsaved(); GUI::Config::ConfigWriter::make()->markUnsaved();
} }