From c092314bf0a4f4ab84040138366848d78a0686ad Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 10 Feb 2016 15:20:54 +0100 Subject: Fix removal of left-over local socket in demobrowser Use QLocalServer::removeServer instead of QFile::remove. The socket is usually not in the current directory. Change-Id: Ie5b20b8b02ec7f3065596ebd945a6639bb65a2c0 Reviewed-by: Allan Sandfeld Jensen --- examples/webenginewidgets/demobrowser/browserapplication.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/examples/webenginewidgets/demobrowser/browserapplication.cpp b/examples/webenginewidgets/demobrowser/browserapplication.cpp index 339061961..37bc05c34 100644 --- a/examples/webenginewidgets/demobrowser/browserapplication.cpp +++ b/examples/webenginewidgets/demobrowser/browserapplication.cpp @@ -146,12 +146,11 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) m_localServer = new QLocalServer(this); connect(m_localServer, SIGNAL(newConnection()), this, SLOT(newLocalSocketConnection())); - if (!m_localServer->listen(serverName)) { - if (m_localServer->serverError() == QAbstractSocket::AddressInUseError - && QFile::exists(m_localServer->serverName())) { - QFile::remove(m_localServer->serverName()); - m_localServer->listen(serverName); - } + if (!m_localServer->listen(serverName) + && m_localServer->serverError() == QAbstractSocket::AddressInUseError) { + QLocalServer::removeServer(serverName); + if (!m_localServer->listen(serverName)) + qWarning("Could not create local socket %s.", qPrintable(serverName)); } #ifndef QT_NO_OPENSSL -- cgit v1.2.3