From b6776bd826fbe31c62a7222d34cf387fb6f3d260 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Wed, 19 Oct 2022 00:03:28 +0200 Subject: [PATCH] getWindowInfo: handle if the Wayland window handle is null --- src/frontend/qt_sdl/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index cd0ea52d..bea8c6dc 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -1325,8 +1325,12 @@ std::optional ScreenPanelGL::getWindowInfo() else if (platform_name == QStringLiteral("wayland")) { wi.type = WindowInfo::Type::Wayland; - wi.display_connection = pni->nativeResourceForWindow("display", windowHandle()); - wi.window_handle = pni->nativeResourceForWindow("surface", windowHandle()); + QWindow* handle = windowHandle(); + if (handle == nullptr) + return std::nullopt; + + wi.display_connection = pni->nativeResourceForWindow("display", handle); + wi.window_handle = pni->nativeResourceForWindow("surface", handle); } else {