提交: a079616e5796d1300945766df2776605a1dbd771 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• 修订版: a079616e5796d1300945766df2776605a1dbd771 (tree)
• 时间: 2022-09-05 05:11:19
• 作者: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Log Message

Fixed: SDL_Init must be called before gtk_init_check (patch from icculus, fixes 4023).

更改概述

• modified: src/sdl/i_main.cpp

差异

diff -r ead9858fb912 -r a079616e5796 src/sdl/i_main.cpp
--- a/src/sdl/i_main.cpp	Sun Sep 04 12:41:07 2022 -0400
+++ b/src/sdl/i_main.cpp	Sun Sep 04 22:11:19 2022 +0200
@@ -263,9 +263,10 @@
 	// Note that the LANG environment variable is overridden by LC_*
 	setenv ("LC_NUMERIC", "C", 1);
 
-#ifndef NO_GTK
-	GtkAvailable = gtk_init_check (&argc, &argv);
-#endif
+// [BB] Patch from icculus for SDL 1.2 compatibility.
+// #ifndef NO_GTK
+//	GtkAvailable = gtk_init_check (&argc, &argv);
+// #endif
 	
 	setlocale (LC_ALL, "C");
 
@@ -302,6 +303,14 @@
 
 	atterm (SDL_Quit);
 
+	// [BB] Patch from icculus for SDL 1.2 compatibility.
+	// Make sure gtk_init_check happens _after_ SDL_Init, so SDL will call
+	// XInitThreads() on X11, then GTK+ will talk to Xlib without leaving
+	// mutexes uncreated that the system is going to expect to be initialized.
+#ifndef NO_GTK
+	GtkAvailable = gtk_init_check (&argc, &argv);
+#endif
+
 	{
 		char viddriver[80];