From e72d9de34ae12d5d56ce4e3a1f5feac95283b78b Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 11 Dec 2010 19:30:14 +0000 Subject: [PATCH] Make sure we don't move completed torrent to the temp directory for checking --- src/qtlibtorrent/qbtsession.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp index 25c1cfd2d..3c4dd1068 100644 --- a/src/qtlibtorrent/qbtsession.cpp +++ b/src/qtlibtorrent/qbtsession.cpp @@ -1037,7 +1037,9 @@ QTorrentHandle QBtSession::addTorrent(QString path, bool fromScanDir, QString fr TorrentPersistentData::setRootFolder(hash, root_folder); // If temp path is enabled, move torrent - if(!defaultTempPath.isEmpty() && !resumed) { + // XXX: The torrent is moved after the torrent_checked_alert + // is received to make sure we don't move a completed torrent (#602938) + /*if(!defaultTempPath.isEmpty() && !resumed) { qDebug("Temp folder is enabled, moving new torrent to temp folder"); QString torrent_tmp_path = defaultTempPath.replace("\\", "/"); if(!root_folder.isEmpty()) { @@ -1045,7 +1047,7 @@ QTorrentHandle QBtSession::addTorrent(QString path, bool fromScanDir, QString fr torrent_tmp_path += root_folder; } h.move_storage(torrent_tmp_path); - } + }*/ loadTorrentSettings(h); @@ -2310,6 +2312,7 @@ void QBtSession::readAlerts() { const QDir current_dir(h.save_path()); const QDir save_dir(getSavePath(h.hash())); if(current_dir == save_dir) { + qDebug("Moving the torrent to the temp directory..."); QString root_folder = TorrentPersistentData::getRootFolder(hash); QString torrent_tmp_path = defaultTempPath.replace("\\", "/"); if(!root_folder.isEmpty()) {