CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-07-07 21:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SYNERGY-694 Prevent client duplication.

Browse Source
This commit is contained in:
Serhii Hadzhilov 2021-04-28 15:49:27 +03:00
parent 7fa08c51e3
commit 4bbe8108a2
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/src/ServerConfig.cpp
View File

@ -412,6 +412,23 @@ bool ServerConfig::isFull() const
return isFull;
}
bool ServerConfig::isScreenExists(const QString& screenName) const
{
bool isExists = false;
for (const auto& screen : screens())
{
if (!screen.isNull() &&
screen.name() == screenName)
{
isExists = true;
break;
}
}
return isExists;
}
void ServerConfig::setConfigFile(const QString& configFile)
{
m_pAppConfig->setConfigFile(configFile);

1
src/gui/src/ServerConfig.h
View File

@ -85,6 +85,7 @@ class ServerConfig : public BaseConfig, public GUI::Config::ConfigBase
const QString& getConfigFile() const;
bool getUseExternalConfig() const;
bool isFull() const;
bool isScreenExists(const QString& screenName) const;
protected:
QSettings& settings();

10
src/gui/src/ServerConnection.cpp
View File

@ -59,10 +59,10 @@ bool ServerConnection::checkMainWindow()
void ServerConnection::addClient(const QString& clientName)
{
if (!m_parent.serverConfig().isFull() && checkMainWindow())
if (!m_parent.serverConfig().isFull() &&
!m_parent.serverConfig().isScreenExists(clientName) &&
checkMainWindow())
{
m_parent.stopSynergy();
QMessageBox message(&m_parent);
message.addButton(QObject::tr("Ignore"), QMessageBox::RejectRole);
message.addButton(QObject::tr("Accept and configure"), QMessageBox::AcceptRole);
@ -76,8 +76,6 @@ void ServerConnection::addClient(const QString& clientName)
{
m_ignoredClients.append(clientName);
}
m_parent.startSynergy();
}
}
@ -88,4 +86,6 @@ void ServerConnection::configureClient(const QString& clientName)
ServerConfigDialog dlg(&m_parent, config);
dlg.exec();
m_parent.restartSynergy();
}