[Mac] Call xamarin_initialize_cocoa_threads so objects constructed on threads that are not the main one are released

Fixes VSTS #1012551 - Launcher does not call xamarin_initialize_cocoa_threads

1 files changed, 10 insertions, 2 deletions

diff --git a/main/build/MacOSX/monostub.mm b/main/build/MacOSX/monostub.mm
index f42dd641aa..ef57c566f3 100644
--- a/main/build/MacOSX/monostub.mm
+++ b/main/build/MacOSX/monostub.mm
@@ -22,6 +22,7 @@ typedef char * (* mono_get_runtime_build_info) (void);
 typedef char * (* mono_parse_options_from) (const char *, int *, char **[]);
 typedef void (* monoeg_g_free) (void *ptr);
 typedef void (* gobject_tracker_init) (void *libmono);
+typedef void (* xamarin_initialize_cocoa_threads) (void *);
 
 static NSString *appName;
 
@@ -213,7 +214,7 @@ should_load_xammac_registrar()
 #endif
 }
 
-static void
+static void *
 load_xammac()
 {
 	void *libxammac = dlopen("libxammac.dylib", RTLD_LAZY);
@@ -225,6 +226,8 @@ load_xammac()
 	if (should_load_xammac_registrar()) {
 		XAMARIN_CREATE_CLASSES ();
 	}
+
+	return libxammac;
 }
 
 int
@@ -298,7 +301,7 @@ main (int argc, char **argv)
 			exit_with_message (msg);
 		}
 
-		load_xammac();
+		void *libxammac = load_xammac();
 
 		try_load_gobject_tracker (libmono);
 
@@ -344,6 +347,11 @@ main (int argc, char **argv)
 
 		//clock_t end = clock();
 		//printf("%f seconds to start\n", (float)(end - start) / CLOCKS_PER_SEC);
+
+		// Xamarin.Mac's launcher.m seems to set these up
+
+		xamarin_initialize_cocoa_threads _xamarin_initialize_cocoa_threads = (xamarin_initialize_cocoa_threads)load_symbol("xamarin_initialize_cocoa_threads", libxammac, "Xamarin.Mac");
+		_xamarin_initialize_cocoa_threads (NULL);
 	}
 
 	return _mono_main (new_argc, new_argv);