all: ensure deleteLater'd QObjects are disconnected

src/core/generation.cpp

@@ -198,6 +198,7 @@ void EngineGeneration::setWatchingFiles(bool watching) {
 		}
 	} else {
 		if (this->watcher != nullptr) {
+			QObject::disconnect(this->watcher, nullptr, this, nullptr);
 			this->watcher->deleteLater();
 			this->watcher = nullptr;
 		}

src/core/qsmenuanchor.cpp

@@ -74,6 +74,7 @@ void QsMenuAnchor::onClosed() {
 	this->mOpen = false;
 
 	if (this->platformMenu) {
+		QObject::disconnect(this->platformMenu, nullptr, this, nullptr);
 		this->platformMenu->deleteLater();
 		this->platformMenu = nullptr;
 	}
@@ -101,7 +102,12 @@ void QsMenuAnchor::setMenu(QsMenuHandle* menu) {
 	if (menu == this->mMenu) return;
 
 	if (this->mMenu != nullptr) {
-		if (this->platformMenu != nullptr) this->platformMenu->deleteLater();
+		if (this->platformMenu != nullptr) {
+			QObject::disconnect(this->platformMenu, nullptr, this, nullptr);
+			this->platformMenu->deleteLater();
+			this->platformMenu = nullptr;
+		}
+
 		QObject::disconnect(this->mMenu, nullptr, this, nullptr);
 	}
 

src/io/process.cpp

@@ -272,6 +272,7 @@ void Process::onStarted() {
 }
 
 void Process::onFinished(qint32 exitCode, QProcess::ExitStatus exitStatus) {
+	QObject::disconnect(this->process, nullptr, this, nullptr);
 	this->process->deleteLater();
 	this->process = nullptr;
 	if (this->mStdoutParser) this->mStdoutParser->streamEnded(this->stdoutBuffer);
@@ -290,6 +291,7 @@ void Process::onErrorOccurred(QProcess::ProcessError error) {
 	if (error == QProcess::FailedToStart) { // other cases should be covered by other events
 		qWarning() << "Process failed to start, likely because the binary could not be found. Command:"
 		           << this->mCommand;
+		QObject::disconnect(this->process, nullptr, this, nullptr);
 		this->process->deleteLater();
 		this->process = nullptr;
 		emit this->runningChanged();

src/io/socket.cpp

@@ -17,7 +17,11 @@
 QS_LOGGING_CATEGORY(logSocket, "quickshell.io.socket", QtWarningMsg);
 
 void Socket::setSocket(QLocalSocket* socket) {
-	if (this->socket != nullptr) this->socket->deleteLater();
+	if (this->socket != nullptr) {
+		QObject::disconnect(this->socket, nullptr, this, nullptr);
+		this->socket->deleteLater();
+	}
+
 	this->socket = socket;
 
 	if (socket != nullptr) {
@@ -57,6 +61,7 @@ void Socket::onSocketDisconnected() {
 	qCDebug(logSocket) << "Socket disconnected:" << this;
 	this->connected = false;
 	this->disconnecting = false;
+	QObject::disconnect(this->socket, nullptr, this, nullptr);
 	this->socket->deleteLater();
 	this->socket = nullptr;
 	this->buffer.clear();
@@ -191,6 +196,7 @@ void SocketServer::disableServer() {
 		}
 
 		this->mSockets.clear();
+		QObject::disconnect(this->server, nullptr, this, nullptr);
 		this->server->close();
 		this->server->deleteLater();
 		this->server = nullptr;

src/ipc/ipc.cpp

@@ -62,6 +62,7 @@ IpcServerConnection::IpcServerConnection(QLocalSocket* socket, IpcServer* server
 
 void IpcServerConnection::onDisconnected() {
 	qCInfo(logIpc) << "IPC connection disconnected" << this;
+	QObject::disconnect(this->socket, nullptr, this, nullptr);
 	this->deleteLater();
 }
 

src/services/mpris/watcher.cpp

@@ -65,8 +65,10 @@ void MprisWatcher::onServiceRegistered(const QString& service) {
 
 void MprisWatcher::onServiceUnregistered(const QString& service) {
 	if (auto* player = this->mPlayers.value(service)) {
-		player->deleteLater();
+		QObject::disconnect(player, nullptr, this, nullptr);
 		this->mPlayers.remove(service);
+		this->readyPlayers.removeObject(player);
+		player->deleteLater();
 		qCDebug(logMprisWatcher) << "Unregistered MprisPlayer" << service;
 	} else {
 		qCWarning(logMprisWatcher) << "Got service unregister event for untracked service" << service;

src/services/pipewire/connection.cpp

@@ -102,6 +102,7 @@ void PwConnection::startSocketWatcher() {
 void PwConnection::stopSocketWatcher() {
 	if (this->socketWatcher == nullptr) return;
 
+	QObject::disconnect(this->socketWatcher, nullptr, this, nullptr);
 	this->socketWatcher->deleteLater();
 	this->socketWatcher = nullptr;
 }

src/services/polkit/agentimpl.cpp

@@ -43,6 +43,8 @@ void PolkitAgentImpl::cancelAllRequests(const QString& reason) {
 
 	auto* flow = this->bActiveFlow.value();
 	if (flow) {
+		QObject::disconnect(flow, nullptr, this, nullptr);
+		this->bActiveFlow = nullptr;
 		flow->cancelAuthenticationRequest();
 		flow->deleteLater();
 	}
@@ -169,12 +171,12 @@ void PolkitAgentImpl::finishAuthenticationRequest() {
 	qCDebug(logPolkit) << "finishing authentication request for action"
 	                   << this->bActiveFlow.value()->actionId();
 
+	QObject::disconnect(this->bActiveFlow.value(), nullptr, this, nullptr);
 	this->bActiveFlow.value()->deleteLater();
+	this->bActiveFlow = nullptr;
 
 	if (!this->queuedRequests.empty()) {
 		this->activateAuthenticationRequest();
-	} else {
-		this->bActiveFlow = nullptr;
 	}
 }
 } // namespace qs::service::polkit

src/wayland/hyprland/ipc/connection.cpp

@@ -187,11 +187,13 @@ void HyprlandIpc::makeRequest(
 		requestSocket->flush();
 	};
 
-	auto errorCallback = [=](QLocalSocket::LocalSocketError error) {
-		qCWarning(logHyprlandIpc) << "Error making request:" << error << "request:" << request;
-		requestSocket->deleteLater();
-		callback(false, {});
-	};
+	auto errorCallback =
+			[this, requestSocket, request, callback](QLocalSocket::LocalSocketError error) {
+				qCWarning(logHyprlandIpc) << "Error making request:" << error << "request:" << request;
+				QObject::disconnect(requestSocket, nullptr, this, nullptr);
+				requestSocket->deleteLater();
+				callback(false, {});
+			};
 
 	QObject::connect(requestSocket, &QLocalSocket::connected, this, connectedCallback);
 	QObject::connect(requestSocket, &QLocalSocket::errorOccurred, this, errorCallback);