From 0c5f7f6a330ed308748f2162575fdaf48c1a54f5 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 12 Nov 2025 11:42:02 -0800
Subject: [PATCH] unix: Unref SDL_gtk context on quit
---
src/core/unix/SDL_gtk.c | 7 ++++++-
src/core/unix/SDL_gtk.h | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/core/unix/SDL_gtk.c b/src/core/unix/SDL_gtk.c
index 41a2d2251ecd9..9b0c879b901b3 100644
--- a/src/core/unix/SDL_gtk.c
+++ b/src/core/unix/SDL_gtk.c
@@ -64,6 +64,11 @@ static gulong signal_connect(gpointer instance, const gchar *detailed_signal, vo
static void QuitGtk(void)
{
+ if (sdl_main_context) {
+ gtk.g.main_context_unref(sdl_main_context);
+ sdl_main_context = NULL;
+ }
+
SDL_UnloadObject(libgdk);
SDL_UnloadObject(libgtk);
@@ -137,6 +142,7 @@ static bool InitGtk(void)
SDL_GTK_SYM(gtk, libgdk, g, main_context_push_thread_default);
SDL_GTK_SYM(gtk, libgdk, g, main_context_pop_thread_default);
SDL_GTK_SYM(gtk, libgdk, g, main_context_new);
+ SDL_GTK_SYM(gtk, libgdk, g, main_context_unref);
SDL_GTK_SYM(gtk, libgdk, g, main_context_acquire);
SDL_GTK_SYM(gtk, libgdk, g, main_context_iteration);
@@ -192,7 +198,6 @@ void SDL_Gtk_Quit(void)
QuitGtk();
SDL_zero(gtk);
- sdl_main_context = NULL;
SDL_SetInitialized(>k_init, false);
}
diff --git a/src/core/unix/SDL_gtk.h b/src/core/unix/SDL_gtk.h
index 73fef5a82038b..0287fe0b8f0ed 100644
--- a/src/core/unix/SDL_gtk.h
+++ b/src/core/unix/SDL_gtk.h
@@ -88,6 +88,7 @@ typedef struct SDL_GtkContext
void (*main_context_push_thread_default)(GMainContext *context);
void (*main_context_pop_thread_default)(GMainContext *context);
GMainContext *(*main_context_new)(void);
+ void (*main_context_unref)(GMainContext *context);
gboolean (*main_context_acquire)(GMainContext *context);
gboolean (*main_context_iteration)(GMainContext *context, gboolean may_block);
} g;