X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=958215970e553178497d1c754d314049a891ed92;hb=00bc4b6d70bd54eff4cf66bb105d4cd1d1df8907;hp=0683572628ef4210e2cb31ccaa83096d3b030e28;hpb=d9646c0bf915d1ee5d9d3601a273ff20214bfae7;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 0683572..9582159 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -1130,42 +1130,50 @@ struct StartupData {
 	ChimaraGlkPrivate *glk_data;
 };
 
-/* glk_enter() is the actual function called in the new thread in which glk_main() runs.  */
+static void
+free_startup_data(struct StartupData *startup)
+{
+	int i = 0;
+	while(i < startup->args.argc)
+		g_free(startup->args.argv[i++]);
+	g_free(startup->args.argv);
+	g_free(startup);
+}
+
+/* glk_enter() is the actual function called in the new thread in which
+glk_main() runs. Takes ownership of @startup and will free it. */
 static gpointer
 glk_enter(struct StartupData *startup)
 {
 	extern GPrivate *glk_data_key;
 	g_private_set(glk_data_key, startup->glk_data);
-	
+
 	/* Acquire the Glk thread's references to the input queues */
 	g_async_queue_ref(startup->glk_data->char_input_queue);
 	g_async_queue_ref(startup->glk_data->line_input_queue);
-	
+
 	/* Run startup function */
 	if(startup->glkunix_startup_code) {
 		startup->glk_data->in_startup = TRUE;
 		int result = startup->glkunix_startup_code(&startup->args);
 		startup->glk_data->in_startup = FALSE;
-		
-		int i = 0;
-		while(i < startup->args.argc)
-			g_free(startup->args.argv[i++]);
-		g_free(startup->args.argv);
-		
-		if(!result)
+
+		if(!result) {
+			free_startup_data(startup);
 			return NULL;
+		}
 	}
-	
+
 	/* Run main function */
 	glk_main_t glk_main = startup->glk_main;
-	
+
 	/* COMPAT: avoid usage of slices */
-	g_free(startup);
-    g_signal_emit_by_name(startup->glk_data->self, "started");
+	g_signal_emit_by_name(startup->glk_data->self, "started");
 	glk_main();
+	free_startup_data(startup);
 	glk_exit(); /* Run shutdown code in glk_exit() even if glk_main() returns normally */
 	g_assert_not_reached(); /* because glk_exit() calls g_thread_exit() */
-	return NULL; 
+	return NULL;
 }
 
 /**