From 8dc34463e3e484d0454139ada85758a3de77d012 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Thu, 21 Jan 2010 21:18:46 +0000
Subject: [PATCH] Improved previous patch: Force recheck only if we detected
 that renaming overwrited an existing file

---
 src/bittorrent.cpp       | 5 ++++-
 src/propertieswidget.cpp | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 3bc926a7a..f3bdb7463 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -1023,13 +1023,16 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
       h.set_sequential_download(TorrentTempData::isSequential(hash));
       // Import Files names from torrent addition dialog
       QStringList files_path = TorrentTempData::getFilesPath(hash);
+      bool force_recheck = false;
       if(files_path.size() == h.num_files()) {
         for(int i=0; i<h.num_files(); ++i) {
           QString path = files_path.at(i);
+          if(!force_recheck && QFile::exists(h.save_path()+QDir::separator()+path))
+            force_recheck = true;
           h.rename_file(i, path);
         }
         // Force recheck
-        h.force_recheck();
+        if(force_recheck) h.force_recheck();
       }
     }
     QString label = TorrentTempData::getLabel(hash);
diff --git a/src/propertieswidget.cpp b/src/propertieswidget.cpp
index 7f6cf6d53..cf6e5e76d 100644
--- a/src/propertieswidget.cpp
+++ b/src/propertieswidget.cpp
@@ -576,10 +576,11 @@ void PropertiesWidget::renameSelectedFile() {
             return;
           }
         }
+        bool force_recheck = QFile::exists(h.save_path()+QDir::separator()+new_name);
         qDebug("Renaming %s to %s", old_name.toLocal8Bit().data(), new_name.toLocal8Bit().data());
         h.rename_file(file_index, new_name);
         // Force recheck
-        h.force_recheck();
+        if(force_recheck) h.force_recheck();
         // Rename if torrent files model too
         if(new_name_last.endsWith(".!qB"))
           new_name_last.chop(4);
@@ -613,18 +614,21 @@ void PropertiesWidget::renameSelectedFile() {
               return;
             }
           }
+          bool force_recheck = false;
           // Replace path in all files
           for(int i=0; i<num_files; ++i) {
             QString current_name = misc::toQString(h.get_torrent_info().file_at(i).path.string());
             if(current_name.startsWith(old_path)) {
               QString new_name = current_name;
               new_name.replace(0, old_path.length(), new_path);
+              if(!force_recheck && QFile::exists(h.save_path()+QDir::separator()+new_name))
+                force_recheck = true;
               qDebug("Rename %s to %s", current_name.toLocal8Bit().data(), new_name.toLocal8Bit().data());
               h.rename_file(i, new_name);
             }
           }
           // Force recheck
-          h.force_recheck();
+          if(force_recheck) h.force_recheck();
           // Rename folder in torrent files model too
           PropListModel->setData(index, new_name_last);
           // Remove old folder