CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: harden watchPath. NO DUPLICATES! >:(

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-04-03 15:26:26 -07:00
parent 5ce7874280
commit 62c59820cf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/ui/dialogs/BlockedModsDialog.cpp
View File

@ -192,16 +192,19 @@ void BlockedModsDialog::setupWatch()
void BlockedModsDialog::watchPath(QString path, bool watch_subdirectories) void BlockedModsDialog::watchPath(QString path, bool watch_subdirectories)
{ {
if (m_watcher.directories().contains(path)) auto to_watch = QFileInfo(path);
auto to_watch_path = to_watch.canonicalPath();
if (m_watcher.directories().contains(to_watch_path))
return; // don't watch the same path twice (no loops!) return; // don't watch the same path twice (no loops!)
qDebug() << "[Blocked Mods Dialog] Adding Watch Path:" << path; qDebug() << "[Blocked Mods Dialog] Adding Watch Path:" << path;
m_watcher.addPath(path); m_watcher.addPath(to_watch_path);
if (!watch_subdirectories) if (!to_watch.isDir() || !watch_subdirectories)
return; return;
QDirIterator it(path, QDir::Filter::Dirs | QDir::Filter::NoDotAndDotDot, QDirIterator::NoIteratorFlags);
QDirIterator it(to_watch_path, QDir::Filter::Dirs | QDir::Filter::NoDotAndDotDot, QDirIterator::NoIteratorFlags);
while (it.hasNext()) { while (it.hasNext()) {
QString watch_dir = QDir(it.next()).canonicalPath(); // resolve symlinks and relative paths QString watch_dir = QDir(it.next()).canonicalPath(); // resolve symlinks and relative paths
watchPath(watch_dir, watch_subdirectories); watchPath(watch_dir, watch_subdirectories);