getWindowInfo: handle if the Wayland window handle is null

sinistarZ · Oct 18, 2022 · b6776bd · b6776bd
1 parent ac3118c
commit b6776bd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
@@ -1325,8 +1325,12 @@ std::optional<WindowInfo> 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
     {