diff --git a/src/logcatcher.cpp b/src/logcatcher.cpp
index aa7c9d7..020efee 100644
--- a/src/logcatcher.cpp
+++ b/src/logcatcher.cpp
@@ -236,9 +236,12 @@ QStringList LogCatcher::files()
 
 #ifdef USE_FALLBACK_POLLER
     QStringList files;
-    foreach(QFileInfo fileInfo, watchList)
+    foreach(QFileInfoList watchList, dirWatchList)
     {
-        files.append(fileInfo.absoluteFilePath());
+        foreach(QFileInfo fileInfo, watchList)
+        {
+            files.append(fileInfo.absoluteFilePath());
+        }
     }
     return files;
 #else
diff --git a/src/logcatcher.h b/src/logcatcher.h
index 4159aeb..867578f 100644
--- a/src/logcatcher.h
+++ b/src/logcatcher.h
@@ -21,11 +21,6 @@
 #ifndef LOGCATCHER_H
 #define LOGCATCHER_H
 
-/* For some reason, actually using the above define in this same file ends up with the
- * QTimer not firing?!?!  At least it does when testing with gcc on Linux.  That's why I
- * do not use the flag below to optimize what's built on Linux.
- */
-
 #include <QFileInfoList>
 #include <QFileSystemWatcher>
 #include <QMap>
@@ -76,8 +71,6 @@ public slots:
 
     Options* m_options;
     QFileSystemWatcher dirWatcher;
-//    QFileInfoList watchList;
-//    QFileInfoList lastAllFiles;
     QSet<QString> localChannels;
     QString logDir;