summaryrefslogtreecommitdiff
path: root/legacy/eio
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-09-10 01:52:39 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-09-10 01:52:39 +0000
commitfb7e0ea5b5879be9784d75ba69c05652a2ab47a9 (patch)
tree8f25b0eaf47fc63ccd0dea358d177a7dfea1e2cb /legacy/eio
parent08698e963775dec0971a9b53147605aab2707d9c (diff)
eio: Fix monitor shutdown when main loop did never run.
SVN revision: 76365
Diffstat (limited to 'legacy/eio')
-rw-r--r--legacy/eio/ChangeLog4
-rw-r--r--legacy/eio/NEWS14
-rw-r--r--legacy/eio/src/lib/eio_monitor.c15
3 files changed, 32 insertions, 1 deletions
diff --git a/legacy/eio/ChangeLog b/legacy/eio/ChangeLog
index 0dc04a1cbc..d576945865 100644
--- a/legacy/eio/ChangeLog
+++ b/legacy/eio/ChangeLog
@@ -39,3 +39,7 @@
392012-09-06 Vincent Torri 392012-09-06 Vincent Torri
40 40
41 * Improve file monitoring on Windows to mimic more inotify behavior. 41 * Improve file monitoring on Windows to mimic more inotify behavior.
42
432012-09-10 Cedric Bail
44
45 * Fix monitor shutdown when mainloop did never run.
diff --git a/legacy/eio/NEWS b/legacy/eio/NEWS
index aedcbee570..8a42fa7b9f 100644
--- a/legacy/eio/NEWS
+++ b/legacy/eio/NEWS
@@ -1,3 +1,17 @@
1Eio 1.8.0
2
3Changes since Eio 1.7.0:
4-------------------------
5
6Additions:
7
8Fixes:
9 - fix monitor shutdown when mainloop did never run.
10
11Improvements:
12
13Removal:
14
1Eio 1.7.0 15Eio 1.7.0
2 16
3Changes since Eio 1.0.0: 17Changes since Eio 1.0.0:
diff --git a/legacy/eio/src/lib/eio_monitor.c b/legacy/eio/src/lib/eio_monitor.c
index c21b1f49ca..9f735d63c6 100644
--- a/legacy/eio/src/lib/eio_monitor.c
+++ b/legacy/eio/src/lib/eio_monitor.c
@@ -158,7 +158,20 @@ eio_monitor_init(void)
158void 158void
159eio_monitor_shutdown(void) 159eio_monitor_shutdown(void)
160{ 160{
161 /* FIXME: Need to cancel all request... */ 161 Eina_Iterator *it;
162 Eio_Monitor *monitor;
163
164 it = eina_hash_iterator_data_new(_eio_monitors);
165 EINA_ITERATOR_FOREACH(it, monitor)
166 {
167 if (monitor->exist)
168 {
169 eio_file_cancel(monitor->exist);
170 monitor->exist = NULL;
171 }
172 monitor->delete_me = EINA_TRUE;
173 }
174 eina_iterator_free(it);
162 eina_hash_free(_eio_monitors); 175 eina_hash_free(_eio_monitors);
163 176
164 eio_monitor_backend_shutdown(); 177 eio_monitor_backend_shutdown();