mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-16 14:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't close an externally owned display on init failure

Browse Source
This commit is contained in:
Frank Praznik
2024-12-15 10:44:31 -05:00
parent 6cc9ce183d
commit eb3fc0684c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/wayland/SDL_waylandvideo.c
View File

@@ -525,14 +525,18 @@ static SDL_VideoDevice *Wayland_CreateDevice(bool require_preferred_protocols)
* and frame-pacing by default due to swapchain starvation. * and frame-pacing by default due to swapchain starvation.
*/ */
if (require_preferred_protocols && !Wayland_IsPreferred(display)) { if (require_preferred_protocols && !Wayland_IsPreferred(display)) {
WAYLAND_wl_display_disconnect(display); if (!display_is_external) {
WAYLAND_wl_display_disconnect(display);
}
SDL_WAYLAND_UnloadSymbols(); SDL_WAYLAND_UnloadSymbols();
return NULL; return NULL;
} }
data = SDL_calloc(1, sizeof(*data)); data = SDL_calloc(1, sizeof(*data));
if (!data) { if (!data) {
WAYLAND_wl_display_disconnect(display); if (!display_is_external) {
WAYLAND_wl_display_disconnect(display);
}
SDL_WAYLAND_UnloadSymbols(); SDL_WAYLAND_UnloadSymbols();
return NULL; return NULL;
} }
@@ -540,7 +544,9 @@ static SDL_VideoDevice *Wayland_CreateDevice(bool require_preferred_protocols)
input = SDL_calloc(1, sizeof(*input)); input = SDL_calloc(1, sizeof(*input));
if (!input) { if (!input) {
SDL_free(data); SDL_free(data);
WAYLAND_wl_display_disconnect(display); if (!display_is_external) {
WAYLAND_wl_display_disconnect(display);
}
SDL_WAYLAND_UnloadSymbols(); SDL_WAYLAND_UnloadSymbols();
return NULL; return NULL;
} }
@@ -562,7 +568,9 @@ static SDL_VideoDevice *Wayland_CreateDevice(bool require_preferred_protocols)
if (!device) { if (!device) {
SDL_free(input); SDL_free(input);
SDL_free(data); SDL_free(data);
WAYLAND_wl_display_disconnect(display); if (!display_is_external) {
WAYLAND_wl_display_disconnect(display);
}
SDL_WAYLAND_UnloadSymbols(); SDL_WAYLAND_UnloadSymbols();
return NULL; return NULL;
} }