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

Move try-catch to dtor point of stack

Browse source
This commit is contained in:
Nick Bolton 2024-07-29 23:59:21 +01:00
parent f9b93210ed
commit 6b803618e9
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/lib/server/Server.cpp
View file

@ -241,8 +241,13 @@ Server::~Server() {
m_events->removeHandler(Event::kTimer, this); m_events->removeHandler(Event::kTimer, this);
stopSwitch(); stopSwitch();
// force immediate disconnection of secondary clients try {
disconnect(); // force immediate disconnection of secondary clients
disconnect();
} catch (std::exception &e) { // NOSONAR
LOG((CLOG_ERR "failed to disconnect: %s", e.what()));
}
for (OldClients::iterator index = m_oldClients.begin(); for (OldClients::iterator index = m_oldClients.begin();
index != m_oldClients.end(); ++index) { index != m_oldClients.end(); ++index) {
BaseClientProxy *client = index->first; BaseClientProxy *client = index->first;
@ -2072,11 +2077,7 @@ void Server::closeClient(BaseClientProxy *client, const char *msg) {
// move client to closing list // move client to closing list
removeClient(client); removeClient(client);
try { m_oldClients.insert(std::make_pair(client, timer));
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