encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3950 - Don't always call dbus_shutdown in SDL_DBus 

Alexander Larsson

dbus_shutdown() is a debug feature which closes all global resources in the dbus library. Calling this should be done by the app, not a library, because if there are multiple users of dbus in the process then SDL could shut it down even though another part is using it.

For example, i had an issue with this in mGBA, which uses both Qt and SDL, both using libdbus. I had a session bus, but no system bus (this was in a flatpak sandbox), and when SDL_DBus_Init() failed to init the system bus it called dbus_shudown() and continued on. This caused issues for Qt when running due to its session bus connections having disappeared beneath it.
This commit is contained in:
Sam Lantinga 2018-02-13 08:07:52 -08:00
parent 4ff16ba3a4
commit 714085d327
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/linux/SDL_dbus.c
View File

@ -139,9 +139,14 @@ SDL_DBus_Quit(void)
dbus.connection_close(dbus.session_conn); dbus.connection_close(dbus.session_conn);
dbus.connection_unref(dbus.session_conn); dbus.connection_unref(dbus.session_conn);
} }
/* Don't do this - bug 3950
dbus_shutdown() is a debug feature which closes all global resources in the dbus library. Calling this should be done by the app, not a library, because if there are multiple users of dbus in the process then SDL could shut it down even though another part is using it.
*/
#if 0
if (dbus.shutdown) { if (dbus.shutdown) {
dbus.shutdown(); dbus.shutdown();
} }
#endif
SDL_zero(dbus); SDL_zero(dbus);
UnloadDBUSLibrary(); UnloadDBUSLibrary();
} }