QtSingleApplication: Clean up socket creation.

gottcode · Dec 5, 2018 · 4b8f11f · 4b8f11f
1 parent 6504e14
commit 4b8f11f
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/qtsingleapplication/qtlocalpeer.cpp b/src/qtsingleapplication/qtlocalpeer.cpp
@@ -112,15 +112,9 @@ bool QtLocalPeer::isClient()
     if (!lockFile->tryLock(50))
         return true;
 
-    bool res = server->listen(socketName);
-#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0))
-    // ### Workaround
-    if (!res && server->serverError() == QAbstractSocket::AddressInUseError) {
-        QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName);
-        res = server->listen(socketName);
-    }
-#endif
-    if (!res)
+    if (!QLocalServer::removeServer(socketName))
+        qWarning("QtSingleCoreApplication: could not clean up socket");
+    if (!server->listen(socketName))
         qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
     QObject::connect(server, SIGNAL(newConnection()), SLOT(receiveConnection()));
     return false;