From 8863bf55ff5c4045e82e468aa7a8e7969e8c921d Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Mon, 5 May 2025 22:52:47 -0700
Subject: [PATCH] core/window: fix null QObject::connect in
 ProxyWindowBase::setScreen

---
 src/window/proxywindow.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/window/proxywindow.cpp b/src/window/proxywindow.cpp
index 8ce80c2..5224c10 100644
--- a/src/window/proxywindow.cpp
+++ b/src/window/proxywindow.cpp
@@ -331,8 +331,10 @@ void ProxyWindowBase::setScreen(QuickshellScreenInfo* screen) {
 		QObject::disconnect(this->mScreen, nullptr, this, nullptr);
 	}
 
-	if (this->qscreen() != qscreen) {
-		this->mScreen = qscreen;
+	auto* oldScreen = this->qscreen();
+	this->mScreen = qscreen;
+
+	if (oldScreen != qscreen) {
 		if (this->window == nullptr) {
 			emit this->screenChanged();
 		} else if (qscreen) {