From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 23 Oct 2013 18:17:48 +0000 (-0400)
Subject: gtester: only remove source if not already dead
X-Git-Tag: 2.39.0~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4bcd3e65aa580fb23bca6e1b09f62dff5837237;p=platform%2Fupstream%2Fglib.git

gtester: only remove source if not already dead

Don't attempt to g_source_remove() a source for which we already returned FALSE
from the handler.

https://bugzilla.gnome.org/show_bug.cgi?id=710724
---

diff --git a/glib/gtester.c b/glib/gtester.c
index 12f7f1a..507742f 100644
--- a/glib/gtester.c
+++ b/glib/gtester.c
@@ -421,7 +421,9 @@ launch_test_binary (const char *binary,
       loop_pending = g_main_context_pending (NULL);
     }
 
-  g_source_remove (child_report_cb_id);
+  if (subtest_io_pending)
+    g_source_remove (child_report_cb_id);
+
   close (report_pipe[0]);
   g_test_log_buffer_free (tlb);