Merge pull request #8900 from sledgehammer999/fix_delete_logs

Fix deletion of old logs

src/app/filelogger.cpp

@@ -83,21 +83,21 @@ void FileLogger::changePath(const QString& newPath)
 void FileLogger::deleteOld(const int age, const FileLogAgeType ageType)
 {
     QDateTime date = QDateTime::currentDateTime();
-    QDir dir(m_path);
+    QDir dir(Utils::Fs::branchPath(m_path));
 
+    foreach (const QFileInfo file, dir.entryInfoList(QStringList("qbittorrent.log.bak*"), QDir::Files | QDir::Writable, QDir::Time | QDir::Reversed)) {
+        QDateTime modificationDate = file.lastModified();
         switch (ageType) {
         case DAYS:
-        date = date.addDays(age);
+            modificationDate = modificationDate.addDays(age);
             break;
         case MONTHS:
-        date = date.addMonths(age);
+            modificationDate = modificationDate.addMonths(age);
             break;
         default:
-        date = date.addYears(age);
+            modificationDate = modificationDate.addYears(age);
         }
-
+        if (modificationDate > date)
-    foreach (const QFileInfo file, dir.entryInfoList(QStringList("qbittorrent.log.bak*"), QDir::Files | QDir::Writable, QDir::Time | QDir::Reversed)) {
-        if (file.lastModified() < date)
             break;
         Utils::Fs::forceRemove(file.absoluteFilePath());
     }