Catch exception propagating to Server dtor (#7416)
* Catch throw in dtor * Update ChangeLog
This commit is contained in:
parent
c9e11a6fdc
commit
a99d1ca87d
3 changed files with 12 additions and 2 deletions
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
|
|
@ -1,4 +1,8 @@
|
||||||
{
|
{
|
||||||
"sonarlint.pathToCompileCommands": "${workspaceFolder}/build/compile_commands.json",
|
"sonarlint.pathToCompileCommands": "${workspaceFolder}/build/compile_commands.json",
|
||||||
"gcovViewer.buildDirectories": ["${workspaceFolder}/build/src/lib"]
|
"gcovViewer.buildDirectories": ["${workspaceFolder}/build/src/lib"],
|
||||||
|
"sonarlint.connectedMode.project": {
|
||||||
|
"connectionId": "symless",
|
||||||
|
"projectKey": "symless_synergy-core"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,7 @@ Enhancements:
|
||||||
- #7413 Improve UI design and reduce over-use of `#ifdef`
|
- #7413 Improve UI design and reduce over-use of `#ifdef`
|
||||||
- #7414 Expand BSD sockets poll tests and remove legacy-poll code
|
- #7414 Expand BSD sockets poll tests and remove legacy-poll code
|
||||||
- #7415 Assert arg value `num > 0` for BSD socket poll unblock pipe
|
- #7415 Assert arg value `num > 0` for BSD socket poll unblock pipe
|
||||||
|
- #7416 Catch exception propagating to `Server` dtor
|
||||||
|
|
||||||
# 1.14.6
|
# 1.14.6
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2071,7 +2071,12 @@ void Server::closeClient(BaseClientProxy *client, const char *msg) {
|
||||||
|
|
||||||
// move client to closing list
|
// move client to closing list
|
||||||
removeClient(client);
|
removeClient(client);
|
||||||
m_oldClients.insert(std::make_pair(client, timer));
|
|
||||||
|
try {
|
||||||
|
m_oldClients.insert(std::make_pair(client, timer));
|
||||||
|
} catch (std::exception &e) { // NOSONAR
|
||||||
|
LOG((CLOG_ERR "failed to append old client: %s", e.what()));
|
||||||
|
}
|
||||||
|
|
||||||
// if this client is the active screen then we have to
|
// if this client is the active screen then we have to
|
||||||
// jump off of it
|
// jump off of it
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue