From d4cda5105779b34201be7ef2b3e5e2bf85a78876 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 19 Jan 2025 16:29:58 -0800
Subject: [PATCH] tray: renamed SDL_HasNoActiveTrays() to SDL_HasActiveTrays()

---
 src/events/SDL_windowevents.c | 2 +-
 src/tray/SDL_tray_utils.c     | 4 ++--
 src/tray/SDL_tray_utils.h     | 2 +-
 src/tray/unix/SDL_tray.c      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/events/SDL_windowevents.c b/src/events/SDL_windowevents.c
index 0c7ab79660..2258ce793c 100644
--- a/src/events/SDL_windowevents.c
+++ b/src/events/SDL_windowevents.c
@@ -247,7 +247,7 @@ bool SDL_SendWindowEvent(SDL_Window *window, SDL_EventType windowevent, int data
         break;
     }
 
-    if (windowevent == SDL_EVENT_WINDOW_CLOSE_REQUESTED && !window->parent && SDL_HasNoActiveTrays()) {
+    if (windowevent == SDL_EVENT_WINDOW_CLOSE_REQUESTED && !window->parent && !SDL_HasActiveTrays()) {
         int toplevel_count = 0;
         SDL_Window *n;
         for (n = SDL_GetVideoDevice()->windows; n; n = n->next) {
diff --git a/src/tray/SDL_tray_utils.c b/src/tray/SDL_tray_utils.c
index ce792adc47..35cf5593b0 100644
--- a/src/tray/SDL_tray_utils.c
+++ b/src/tray/SDL_tray_utils.c
@@ -85,7 +85,7 @@ void SDL_CleanupTrays(void)
     SDL_free(trays);
 }
 
-bool SDL_HasNoActiveTrays(void)
+bool SDL_HasActiveTrays(void)
 {
-    return active_trays == 0;
+    return (active_trays > 0);
 }
diff --git a/src/tray/SDL_tray_utils.h b/src/tray/SDL_tray_utils.h
index 8dc2249d22..e9e64fc686 100644
--- a/src/tray/SDL_tray_utils.h
+++ b/src/tray/SDL_tray_utils.h
@@ -23,4 +23,4 @@
 extern void SDL_RegisterTray(SDL_Tray *tray);
 extern void SDL_UnregisterTray(SDL_Tray *tray);
 extern void SDL_CleanupTrays(void);
-extern bool SDL_HasNoActiveTrays(void);
+extern bool SDL_HasActiveTrays(void);
diff --git a/src/tray/unix/SDL_tray.c b/src/tray/unix/SDL_tray.c
index 3d5fafab0c..c543ed5ba0 100644
--- a/src/tray/unix/SDL_tray.c
+++ b/src/tray/unix/SDL_tray.c
@@ -790,7 +790,7 @@ void SDL_DestroyTray(SDL_Tray *tray)
 
     SDL_free(tray);
 
-    if (SDL_HasNoActiveTrays()) {
+    if (!SDL_HasActiveTrays()) {
         gtk_main_quit();
         gtk_thread_active = false;
     }