Do not use QSharedPointer to store FileProviderSocketControllers, use QPointer

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/macOS/fileprovidersocketserver.cpp b/src/gui/macOS/fileprovidersocketserver.cpp
index 9a4dd4cf89a6842997dc2c283a85d3874c9cd257..70b01615705fdad716e42fc7a16d58c62391c680 100644 (file)
--- a/src/gui/macOS/fileprovidersocketserver.cpp
+++ b/src/gui/macOS/fileprovidersocketserver.cpp
@@ -71,7 +71,12 @@ void FileProviderSocketServer::slotNewConnection()
 
 void FileProviderSocketServer::slotSocketDestroyed(const QLocalSocket * const socket)
 {
-    _socketControllers.remove(socket);
+    const auto socketController = _socketControllers.take(socket);
+
+    if (socketController) {
+        const auto rawSocketControllerPtr = socketController.data();
+        delete rawSocketControllerPtr;
+    }
 }
 
 } // namespace Mac

diff --git a/src/gui/macOS/fileprovidersocketserver.h b/src/gui/macOS/fileprovidersocketserver.h
index ca58e2d1a6a3586420530c054d02b3558af8f712..893de666e5a468d80ae0e59f09f34347610de7fe 100644 (file)
--- a/src/gui/macOS/fileprovidersocketserver.h
+++ b/src/gui/macOS/fileprovidersocketserver.h
@@ -22,7 +22,7 @@ namespace OCC {
 namespace Mac {
 
 class FileProviderSocketController;
-using FileProviderSocketControllerPtr = QSharedPointer<FileProviderSocketController>;
+using FileProviderSocketControllerPtr = QPointer<FileProviderSocketController>;
 
 QString fileProviderSocketPath();