[glib] gtester: only remove source if not already dead
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gtester: only remove source if not already dead
- Date: Wed, 23 Oct 2013 19:28:28 +0000 (UTC)
commit a4bcd3e65aa580fb23bca6e1b09f62dff5837237
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Oct 23 14:17:48 2013 -0400
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
glib/gtester.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]