summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2012-05-15 13:03:20 +0000
committerroot <root>2012-05-15 13:03:20 +0000
commit47fe1e57e56447c355cec688abf269e23470e8c0 (patch)
tree6250b2b47ea71d9b33e46517138ed3984a3c8bfb
parent1abb0def006c9dd02941ac27b1c49a27d43bbc81 (diff)
*** empty log message ***
-rw-r--r--Changes2
-rw-r--r--ev.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changes b/Changes
index db51dfa..76e5107 100644
--- a/Changes
+++ b/Changes
@@ -5,6 +5,8 @@ TODO: EV_STANDALONE == NO_HASSEL (do not use clock_gettime in ev_standalone)
TODO: faq, process a thing in each iteration
TODO: dbeugging tips, ev_verify, ev_init twice
+ - destroying a non-default loop would stop the global waitpid
+ watcher (Denis Bilenko).
- queueing pending watchers of higher priority from a watcher now invokes
them in a timely fashion (reported by Denis Bilenko).
- add throw() to all libev functions that cannot throw exceptions, for
diff --git a/ev.c b/ev.c
index a3718cc..0e94222 100644
--- a/ev.c
+++ b/ev.c
@@ -2357,7 +2357,7 @@ ev_loop_destroy (EV_P)
#endif
#if EV_CHILD_ENABLE
- if (ev_is_active (&childev))
+ if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
{
ev_ref (EV_A); /* child watcher */
ev_signal_stop (EV_A_ &childev);