mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-25 10:46:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

BUGFIX: Improve magnet save path handling (clsoes #683395)

Browse source
This commit is contained in:
Christophe Dumez 2010-12-01 19:20:27 +00:00
parent 20630e91ec
commit 6744ee8a4d
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog
View file

@ -18,6 +18,7 @@
- BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol - BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol
overhead inclusion in rate limiter) overhead inclusion in rate limiter)
- BUGFIX: Fix strict super seeding (was not working) - BUGFIX: Fix strict super seeding (was not working)
- BUGFIX: Improve magnet save path handling (clsoes #683395)
- COSMETIC: Replaced message box by on-screen notification for download errors - COSMETIC: Replaced message box by on-screen notification for download errors
- COSMETIC: Improved the torrent creation tool appearance - COSMETIC: Improved the torrent creation tool appearance
- COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha) - COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)

9
src/qtlibtorrent/qbtsession.cpp
View file

@ -855,8 +855,7 @@ QTorrentHandle QBtSession::addMagnetUri(QString magnet_uri, bool resumed) {
add_torrent_params p = initializeAddTorrentParams(hash); add_torrent_params p = initializeAddTorrentParams(hash);
// Get save path // Get save path
QString torrent_name = misc::magnetUriToName(magnet_uri); const QString savePath(getSavePath(hash, false));
const QString savePath(getSavePath(hash, false, QString::null, torrent_name));
if(!defaultTempPath.isEmpty() && !TorrentPersistentData::isSeed(hash) && resumed) { if(!defaultTempPath.isEmpty() && !TorrentPersistentData::isSeed(hash) && resumed) {
qDebug("addMagnetURI: Temp folder is enabled."); qDebug("addMagnetURI: Temp folder is enabled.");
QString torrent_tmp_path = defaultTempPath.replace("\\", "/"); QString torrent_tmp_path = defaultTempPath.replace("\\", "/");
@ -2173,10 +2172,8 @@ void QBtSession::readAlerts() {
torrent_tmp_path += root_folder; torrent_tmp_path += root_folder;
h.move_storage(torrent_tmp_path); h.move_storage(torrent_tmp_path);
} else { } else {
QString save_path = h.save_path().replace("\\", "/"); QString save_path = h.save_path();
if(!save_path.endsWith("/")) save_path += "/"; h.move_storage(QDir(save_path).absoluteFilePath(root_folder));
save_path += root_folder;
h.move_storage(save_path);
} }
} }
emit metadataReceived(h); emit metadataReceived(h);