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

Merge branch 'master' into SYNERGY-1215-Update-links

Browse source
This commit is contained in:
Andrey Batyiev 2021-09-27 18:51:36 +03:00 committed by GitHub
commit 8853e12b71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -11,6 +11,7 @@ Bug fixes:
- #7091 Fix CMakeFileList for unittests - #7091 Fix CMakeFileList for unittests
- #7092 Synergy is running after quit on Linux - #7092 Synergy is running after quit on Linux
- #7095 Update account and upgrade links - #7095 Update account and upgrade links
- #7096 The system duplicates hotkeys in setup
Enhancements: Enhancements:
- #7068 Add Synergy restart when settings changed - #7068 Add Synergy restart when settings changed

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

@ -111,6 +111,7 @@ void ServerConfig::init()
{ {
switchCorners().clear(); switchCorners().clear();
screens().clear(); screens().clear();
hotkeys().clear();
// m_NumSwitchCorners is used as a fixed size array. See Screen::init() // m_NumSwitchCorners is used as a fixed size array. See Screen::init()
for (int i = 0; i < NumSwitchCorners; i++) for (int i = 0; i < NumSwitchCorners; i++)