aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2026-02-25 03:43:58 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

wayland: check screen isPlaceholder and if wl_output is null

Browse source 
Fixes crashes on disconnected monitors
This commit is contained in:
Bryan Paradis 2026-02-18 07:36:21 -08:00 • committed by outfoxxed
parent e7cd1e9982
commit 158db16b93
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog/next.md
View file

@ -46,6 +46,7 @@ set shell id.
- Fixed asynchronous loaders not working before window creation. - Fixed asynchronous loaders not working before window creation.
- Fixed memory leak in IPC handlers. - Fixed memory leak in IPC handlers.
- Fixed ClippingRectangle related crashes. - Fixed ClippingRectangle related crashes.
- Fixed crashes when monitors are unplugged.
## Packaging Changes ## Packaging Changes

2
src/wayland/session_lock/surface.cpp
View file

@ -28,7 +28,7 @@ QSWaylandSessionLockSurface::QSWaylandSessionLockSurface(QtWaylandClient::QWayla
wl_output* output = nullptr; // NOLINT (include) wl_output* output = nullptr; // NOLINT (include)
auto* waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen*>(qwindow->screen()->handle()); auto* waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen*>(qwindow->screen()->handle());
if (waylandScreen != nullptr) { if (waylandScreen != nullptr && !waylandScreen->isPlaceholder() && waylandScreen->output()) {
output = waylandScreen->output(); output = waylandScreen->output();
} else { } else {
qFatal() << "Session lock screen does not corrospond to a real screen. Force closing window"; qFatal() << "Session lock screen does not corrospond to a real screen. Force closing window";

4
src/wayland/wlr_layershell/surface.cpp
View file

@ -143,11 +143,11 @@ LayerSurface::LayerSurface(LayerShellIntegration* shell, QtWaylandClient::QWayla
auto* waylandScreen = auto* waylandScreen =
dynamic_cast<QtWaylandClient::QWaylandScreen*>(qwindow->screen()->handle()); dynamic_cast<QtWaylandClient::QWaylandScreen*>(qwindow->screen()->handle());
if (waylandScreen != nullptr) { if (waylandScreen != nullptr && !waylandScreen->isPlaceholder() && waylandScreen->output()) {
output = waylandScreen->output(); output = waylandScreen->output();
} else { } else {
qWarning() qWarning()
<< "Layershell screen does not corrospond to a real screen. Letting the compositor pick."; << "Layershell screen does not correspond to a real screen. Letting the compositor pick.";
} }
} }