aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2015-11-03 18:17:53 +0100
committerMichael Albinus2015-11-03 18:17:53 +0100
commit436ed2399ade5c41b8ed3cffe177fb5210eff574 (patch)
treeb3becd0d75075b1549417cd0eaea075f010efcf4
parentfcfa23911dfb530c2fb5cdc81518127853c88f9a (diff)
downloademacs-436ed2399ade5c41b8ed3cffe177fb5210eff574.tar.gz
emacs-436ed2399ade5c41b8ed3cffe177fb5210eff574.zip
Fix a stupid error in gfilenotify.c.
* src/gfilenotify.c (dir_monitor_callback): Cancel monitor only, if we've got a `deleted' signal AND the file name is the watched one.
-rw-r--r--src/gfilenotify.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 2057f885300..8660f415e2f 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -110,6 +110,7 @@ dir_monitor_callback (GFileMonitor *monitor,
110 110
111 /* Cancel monitor if file or directory is deleted. */ 111 /* Cancel monitor if file or directory is deleted. */
112 if (!NILP (Fmember (symbol, list2 (Qdeleted, Qmoved))) && 112 if (!NILP (Fmember (symbol, list2 (Qdeleted, Qmoved))) &&
113 (strcmp (name, SSDATA (XCAR (XCDR (watch_object)))) == 0) &&
113 !g_file_monitor_is_cancelled (monitor)) 114 !g_file_monitor_is_cancelled (monitor))
114 g_file_monitor_cancel (monitor); 115 g_file_monitor_cancel (monitor);
115 } 116 }