mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-30 06:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Sam Lantinga
2025-07-31 09:41:35 -07:00
parent b0cdb7143f
commit 2989d0c420
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SDL.c
View File

@@ -667,7 +667,7 @@ void SDL_Quit(void)
SDL_DBus_Quit(); SDL_DBus_Quit();
#endif #endif
#if defined(SDL_PLATFORM_UNIX) && !defined(SDL_PLATFORM_ANDROID) #if defined(SDL_PLATFORM_UNIX) && !defined(SDL_PLATFORM_ANDROID) && !defined(SDL_PLATFORM_EMSCRIPTEN)
SDL_Gtk_Quit(); SDL_Gtk_Quit();
#endif #endif

15
src/tray/unix/SDL_tray.c
View File

@@ -67,8 +67,6 @@ static void (*app_indicator_set_menu)(AppIndicator *self, GtkMenu *menu);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#endif #endif
#ifndef APPINDICATOR_HEADER
static void *libappindicator = NULL; static void *libappindicator = NULL;
static void quit_appindicator(void) static void quit_appindicator(void)
@@ -130,7 +128,6 @@ static bool init_appindicator(void)
return true; return true;
} }
#endif
struct SDL_TrayMenu { struct SDL_TrayMenu {
GtkMenuShell *menu; GtkMenuShell *menu;
@@ -254,7 +251,7 @@ bool SDL_IsTraySupported(void)
static bool has_been_detected_once = false; static bool has_been_detected_once = false;
if (!has_been_detected_once) { if (!has_been_detected_once) {
has_trays = SDL_Gtk_Init(); has_trays = init_appindicator() && SDL_Gtk_Init();
has_been_detected_once = true; has_been_detected_once = true;
} }
@@ -268,12 +265,17 @@ SDL_Tray *SDL_CreateTray(SDL_Surface *icon, const char *tooltip)
return NULL; return NULL;
} }
if (!init_appindicator()) {
return NULL;
}
SDL_Tray *tray = NULL;
SDL_GtkContext *gtk = SDL_Gtk_EnterContext(); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (!gtk) { if (!gtk) {
goto error; goto error;
} }
SDL_Tray *tray = (SDL_Tray *)SDL_calloc(1, sizeof(*tray)); tray = (SDL_Tray *)SDL_calloc(1, sizeof(*tray));
if (!tray) { if (!tray) {
goto error; goto error;
} }
@@ -506,12 +508,13 @@ SDL_TrayEntry *SDL_InsertTrayEntryAt(SDL_TrayMenu *menu, int pos, const char *la
pos = menu->nEntries; pos = menu->nEntries;
} }
SDL_TrayEntry *entry = NULL;
SDL_GtkContext *gtk = SDL_Gtk_EnterContext(); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (!gtk) { if (!gtk) {
goto error; goto error;
} }
SDL_TrayEntry *entry = (SDL_TrayEntry *)SDL_calloc(1, sizeof(*entry)); entry = (SDL_TrayEntry *)SDL_calloc(1, sizeof(*entry));
if (!entry) { if (!entry) {
goto error; goto error;
} }