OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Socket server : Improved server logic

Browse Source
This commit is contained in:
Magne Sjaastad
2014-09-08 15:39:23 +02:00
parent 8c259dcd5e
commit e605ceafa2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@@ -86,7 +86,7 @@ RiaSocketServer::RiaSocketServer(QObject* parent)
return;
}
connect(m_nextPendingConnectionTimer, SIGNAL(timeout()), this, SLOT(handleNextPendingConnection()));
connect(m_nextPendingConnectionTimer, SIGNAL(timeout()), this, SLOT(slotNewClientConnection()));
connect(m_tcpServer, SIGNAL(newConnection()), this, SLOT(slotNewClientConnection()));
}
@@ -114,7 +114,7 @@ void RiaSocketServer::slotNewClientConnection()
{
// If we are currently handling a connection, just ignore the new one until the current one is disconnected.
if (m_currentClient && (m_currentClient->state() == QAbstractSocket::ConnectedState) )
if (m_currentClient && (m_currentClient->state() != QAbstractSocket::UnconnectedState) )
{
//PMonLog("Starting Timer");
m_nextPendingConnectionTimer->start(); // Reset and start again
@@ -318,7 +318,7 @@ void RiaSocketServer::terminateCurrentConnection()
//--------------------------------------------------------------------------------------------------
void RiaSocketServer::handleNextPendingConnection()
{
if (m_currentClient && (m_currentClient->state() == QAbstractSocket::ConnectedState) )
if (m_currentClient && (m_currentClient->state() != QAbstractSocket::UnconnectedState) )
{
//PMonLog("Starting Timer");
m_nextPendingConnectionTimer->start(); // Reset and start again