Changeset 869 for trunk/src

Timestamp:

May 26, 2011, 10:21:28 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

core: Fixed QFileSystemWatcher regression after merging Qt 4.7 that could result in hangs when working with file dialogs etc.

File:

• trunk/src/corelib/io/qfilesystemwatcher.cpp (modified) (2 diffs)

trunk/src/corelib/io/qfilesystemwatcher.cpp

@@ -171 +171 @@
                 emit directoryChanged(path, true);
             } else if (x.value() != fi) {
-                x.value() = fi;
-                emit directoryChanged(path, false);
+                fi.refresh();
+                if (!fi.exists()) {
+                    dit.remove();
+                    emit directoryChanged(path, true);
+                } else {
+                    x.value() = fi;
+                    emit directoryChanged(path, false);
+                }
             }
             yieldCurrentThread();
@@ -250 +256 @@
 {
     QMutexLocker locker(&mutex);
-    QMutableHashIterator<QString, FileInfo> fit(files);
-    while (fit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = fit.next();
-        QString path = x.key();
-        QFileInfo fi(path);
-        if (!fi.exists()) {
-            fit.remove();
-            emit fileChanged(path, true);
-        } else if (x.value() != fi) {
-            x.value() = fi;
-            emit fileChanged(path, false);
-        }
-    }
-    QMutableHashIterator<QString, FileInfo> dit(directories);
-    while (dit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = dit.next();
-        QString path = x.key();
-        QFileInfo fi(path);
-        if (!path.endsWith(QLatin1Char('/')))
-            fi = QFileInfo(path + QLatin1Char('/'));
-        if (!fi.exists()) {
-            dit.remove();
-            emit directoryChanged(path, true);
-        } else if (x.value() != fi) {
-            fi.refresh();
-            if (!fi.exists()) {
-                dit.remove();
-                emit directoryChanged(path, true);
-            } else {
-                x.value() = fi;
-                emit directoryChanged(path, false);
-            }
-        }
-        
-    }
+    startOver = true;
+    askedToFinish = true;
+    waitCond.wakeAll();
 }