Skip to content

Commit

Permalink
Merge pull request #36627 from elpaso/server-standalone-processevents…
Browse files Browse the repository at this point in the history
…-workaround

Dev server workaround for processEvents
  • Loading branch information
elpaso committed May 22, 2020
2 parents 5aea8ed + 8c76c51 commit 12dd3ef
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/server/qgis_mapserver.cpp
Expand Up @@ -259,7 +259,7 @@ int main( int argc, char *argv[] )
};

// This will delete the connection when disconnected before ready read is called
clientConnection->connect( clientConnection, &QAbstractSocket::disconnected, context, connectionDeleter );
clientConnection->connect( clientConnection, &QAbstractSocket::disconnected, context, connectionDeleter, Qt::QueuedConnection );

// Incoming connection parser
clientConnection->connect( clientConnection, &QIODevice::readyRead, context, [ =, &server, &connCounter ] {
Expand Down Expand Up @@ -380,7 +380,7 @@ int main( int argc, char *argv[] )
if ( clientConnection->state() == QAbstractSocket::SocketState::ConnectedState )
{
clientConnection->connect( clientConnection, &QAbstractSocket::disconnected,
clientConnection, connectionDeleter );
clientConnection, connectionDeleter, Qt::QueuedConnection );
}
else
{
Expand Down Expand Up @@ -450,7 +450,7 @@ int main( int argc, char *argv[] )
clientConnection->disconnectFromHost();
}

} );
}, Qt::QueuedConnection );

} );

Expand Down

0 comments on commit 12dd3ef

Please sign in to comment.