Branch: Tag:

2015-10-02

2015-10-02 11:32:10 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Filesystem.Monitor: Fixed some issues in the Inotify case.

Fixes [bug 7570 (#7570)].

870:    protected void unregister_path(int|void dying)    {    if (wd != -1) { +  // NB: instance may be null if the main object has been destructed +  // and we've been called via a destroy(). +  if (instance) {    instance->rm_watch(wd); -  +  }    wd = -1;    if (!dying) {    // We now need to be polled...
1325:    set_blocking();    this::backend = backend;   #if HAVE_INOTIFY +  if (file) {    if (backend) {    file->set_backend(backend);    } else {    file->set_backend(Pike.DefaultBackend);    } -  +  }   #endif    if (was_nonblocking) {    set_nonblocking();