encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-14 23:56:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: (de)initialize d-bus at init and quit.

Browse Source 
Previously we had different subsystems quitting it, in conflict, and risked
multiple threads racing to init it at the same time.

Fixes #3643.
This commit is contained in:
Ryan C. Gordon
2021-04-02 14:35:11 -04:00
parent 57c2a4566f
commit dbdbae44c5
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -575,12 +575,6 @@ Wayland_VideoQuit(_THIS)
Wayland_QuitKeyboard(_this);
/* !!! FIXME: other subsystems use D-Bus, so we shouldn't quit it here;
have SDL.c do this at a higher level, or add refcounting. */
#if SDL_USE_LIBDBUS
SDL_DBus_Quit();
#endif
SDL_free(data->classname);
}

6
src/video/x11/SDL_x11video.c
View File

@@ -457,12 +457,6 @@ X11_VideoQuit(_THIS)
X11_QuitKeyboard(_this);
X11_QuitMouse(_this);
X11_QuitTouch(_this);
/* !!! FIXME: other subsystems use D-Bus, so we shouldn't quit it here;
have SDL.c do this at a higher level, or add refcounting. */
#if SDL_USE_LIBDBUS
SDL_DBus_Quit();
#endif
}
SDL_bool