squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 23:17:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix root folder being cut off if the torrent comes from a scanned folder (Christian Kandeler)

Browse Source
This commit is contained in:
Christophe Dumez
2011-03-10 17:49:12 +00:00
parent 1c313c7c06
commit 92c70bc878
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.6.8 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.6.8
- BUFIX: Fix compilation with libtorrent v0.14.x - BUFIX: Fix compilation with libtorrent v0.14.x
- BUGFIX: Fix issues when writing on NTFS (Linux, Mac)
- BUGFIX: Fix root folder being cut off if the torrent comes from a scanned folder (Christian Kandeler)
* Sat Feb 26 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.7 * Sat Feb 26 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.7
- BUGFIX: Encoding fixes (Windows) - BUGFIX: Encoding fixes (Windows)

6
src/qtlibtorrent/qbtsession.cpp
View File

@@ -2414,12 +2414,12 @@ QString QBtSession::getSavePath(QString hash, bool fromScanDir, QString filePath
qDebug("SavePath got from persistant data is %s", qPrintable(savePath)); qDebug("SavePath got from persistant data is %s", qPrintable(savePath));
bool append_root_folder = false; bool append_root_folder = false;
if(savePath.isEmpty()) { if(savePath.isEmpty()) {
if(fromScanDir && m_scanFolders->downloadInTorrentFolder(filePath)) if(fromScanDir && m_scanFolders->downloadInTorrentFolder(filePath)) {
savePath = QFileInfo(filePath).dir().path(); savePath = QFileInfo(filePath).dir().path();
else { } else {
savePath = defaultSavePath; savePath = defaultSavePath;
append_root_folder = true;
} }
append_root_folder = true;
} }
if(!fromScanDir && appendLabelToSavePath) { if(!fromScanDir && appendLabelToSavePath) {
const QString label = TorrentPersistentData::getLabel(hash); const QString label = TorrentPersistentData::getLabel(hash);