From 211b11b80fcc605afeb318e1a3373aaf17b6dabc Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 31 Oct 2016 13:38:38 -0400
Subject: [PATCH] Fixed a threading issue in uiQueueMain() on GTK+.

---
 README.md   | 5 ++++-
 unix/main.c | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 75c45210..e9d6beac 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,10 @@ This README is being written.<br>
 
 ## Announcements
 
-* **<codedate**
+* **31 October 2016**
+	* @krakjoe noticed that I accidentally used thread-unsafe code in uiQueueMain() on Unix. Fixed.
+
+* **24 October 2016**
 	* `uiWindowSetContentSize()` on Unix no longer needs to call up the GTK+ main loop. As a result, bugs related to strange behavior using that function (and the now-deleted `uiWindowSetPosition()` and `uiWindowCenter()`) should go away. I'll need to go through the bugs to verify as much, though.
 
 * **22 October 2016**
diff --git a/unix/main.c b/unix/main.c
index 9b78c24d..2998bf31 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -91,7 +91,7 @@ static gboolean doqueued(gpointer data)
 	struct queued *q = (struct queued *) data;
 
 	(*(q->f))(q->data);
-	uiFree(q);
+	g_free(q);
 	return FALSE;
 }
 
@@ -99,7 +99,9 @@ void uiQueueMain(void (*f)(void *data), void *data)
 {
 	struct queued *q;
 
-	q = uiNew(struct queued);
+	// we have to use g_new0()/g_free() because uiAlloc() is only safe to call on the main thread
+	// for some reason it didn't affect me, but it did affect krakjoe
+	q = g_new0(struct queued, 1);
 	q->f = f;
 	q->data = data;
 	gdk_threads_add_idle(doqueued, q);