mirror of
https://github.com/quickshell-mirror/quickshell.git
synced 2026-10-27 02:54:36 +00:00
wayland/toplevel: null check window passed to Toplevel::setRectangle
Fixes Toplevel::unsetRectangle, which passes a null.
This commit is contained in:
3 files changed
+7
-3
No files matched your search
@@ -13,3 +13,4 @@
|
|||||||
- Fixed `qs kill` not waiting for the process to exit.
|
- Fixed `qs kill` not waiting for the process to exit.
|
||||||
- Fixed IPC calls from children of a crashed and relaunched process crashing.
|
- Fixed IPC calls from children of a crashed and relaunched process crashing.
|
||||||
- Fixed JsonAdapter crashing when deserializing new objects into an array.
|
- Fixed JsonAdapter crashing when deserializing new objects into an array.
|
||||||
|
- Fixed `Toplevel.unsetRectangle` crashing when calle.
|
||||||
@@ -98,7 +98,7 @@ void Toplevel::setRectangle(QObject* window, QRect rect) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this->rectangle = rect;
|
this->rectangle = rect;
|
||||||
this->handle->setRectangle(proxyWindow->backingWindow(), rect);
|
this->handle->setRectangle(proxyWindow ? proxyWindow->backingWindow() : nullptr, rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toplevel::unsetRectangle() { this->setRectangle(nullptr, QRect()); }
|
void Toplevel::unsetRectangle() { this->setRectangle(nullptr, QRect()); }
|
||||||
|
|||||||
@@ -121,8 +121,11 @@ void ToplevelHandle::setRectangle(QWindow* window, QRect rect) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QObject::disconnect(this->rectWindow, nullptr, this, nullptr);
|
if (this->rectWindow) {
|
||||||
this->rectWindow = nullptr;
|
QObject::disconnect(this->rectWindow, nullptr, this, nullptr);
|
||||||
|
this->rectWindow = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user