summaryrefslogtreecommitdiff
path: root/gthread/gthread-impl.c
diff options
context:
space:
mode:
Diffstat (limited to 'gthread/gthread-impl.c')
-rw-r--r--gthread/gthread-impl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index 24eb3c48e..f0f2be05d 100644
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.c
@@ -294,7 +294,12 @@ g_thread_init (GThreadFunctions* init)
gboolean supported;
if (thread_system_already_initialized)
- g_error ("GThread system may only be initialized once.");
+ {
+ if (init != NULL)
+ g_warning ("GThread system already initialized, ignoring custom thread implementation.");
+
+ return;
+ }
thread_system_already_initialized = TRUE;