summaryrefslogtreecommitdiffstats
path: root/platform/linuxbsd/wayland/display_server_wayland.cpp
diff options
context:
space:
mode:
authorPedro J. Estébanez <pedrojrulez@gmail.com>2024-06-28 17:17:20 +0200
committerPedro J. Estébanez <pedrojrulez@gmail.com>2024-06-28 19:31:50 +0200
commit32d9c93af3e5ff999444eb8e52699110b0fe9afd (patch)
tree89f95ff9f1e6fd79c21047e489a0e0de12cfd6f4 /platform/linuxbsd/wayland/display_server_wayland.cpp
parent811ce36c6090013f1a48676c0388892bf1621288 (diff)
downloadredot-engine-32d9c93af3e5ff999444eb8e52699110b0fe9afd.tar.gz
Improve handling of rendering startup errors
Diffstat (limited to 'platform/linuxbsd/wayland/display_server_wayland.cpp')
-rw-r--r--platform/linuxbsd/wayland/display_server_wayland.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp
index c05ad93f42..adc9beed66 100644
--- a/platform/linuxbsd/wayland/display_server_wayland.cpp
+++ b/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -1469,7 +1469,14 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
#ifdef RD_ENABLED
if (rendering_context) {
rendering_device = memnew(RenderingDevice);
- rendering_device->initialize(rendering_context, MAIN_WINDOW_ID);
+ if (rendering_device->initialize(rendering_context, MAIN_WINDOW_ID) != OK) {
+ memdelete(rendering_device);
+ rendering_device = nullptr;
+ memdelete(rendering_context);
+ rendering_context = nullptr;
+ r_error = ERR_UNAVAILABLE;
+ return;
+ }
rendering_device->screen_create(MAIN_WINDOW_ID);
RendererCompositorRD::make_current();