comparison src/fswatcher.cpp @ 730:f1dc72b940d5

Crude way to avoid callback on a deleted watcher on exit (macOS)

  * linked with the FSEvents API to run on 10.4 without some fiddling,
  * and I'm not really keen to do that either.  That may be our cue to
  * drop 10.4 support for EasyMercurial.
  */
 
+static bool abandoning = false; // emergency flag for use by non-member callback
+
 FsWatcher::FsWatcher() :
     m_lastToken(0),
     m_lastCounter(0)
 {
 #ifdef Q_OS_MAC

 #endif
 }
 
 FsWatcher::~FsWatcher()
 {
+    QMutexLocker locker(&m_mutex);
+    abandoning = true;
 }
 
 void
 FsWatcher::setWorkDirPath(QString path)
 {

                  size_t numEvents,
                  void *paths,
                  const FSEventStreamEventFlags /* eventFlags */[],
                  const FSEventStreamEventId /*eventIDs */[])
 {
+    if (abandoning) return;
     FsWatcher *watcher = reinterpret_cast<FsWatcher *>(clientCallBackInfo);
     const char *const *cpaths = reinterpret_cast<const char *const *>(paths);
     for (size_t i = 0; i < numEvents; ++i) {
 #ifdef DEBUG_FSWATCHER
         std::cerr << "path " << i << " = " << cpaths[i] << std::endl;