- BUGFIX: Do not create the torrent root folder at final destination if

torrent is in the temp dir (closes #673271)
This commit is contained in:
Christophe Dumez
2010-11-10 17:39:21 +00:00
parent 8d6df1f15f
commit efcd652e3d
3 changed files with 4 additions and 2 deletions

View File

@@ -3,6 +3,8 @@
- BUGFIX: Improved IPv6 support (IP filter and Peer list) - BUGFIX: Improved IPv6 support (IP filter and Peer list)
- BUGFIX: Make IP filter more tolerant towards strangely formatted IPs - BUGFIX: Make IP filter more tolerant towards strangely formatted IPs
- BUGFIX: More reliable folder scanning - BUGFIX: More reliable folder scanning
- BUGFIX: Do not create the torrent root folder at final destination if
torrent is in the temp dir (closes #673271)
- BUGFIX: Fix compilation with libnotify v0.7.0 (closes #671769) - BUGFIX: Fix compilation with libnotify v0.7.0 (closes #671769)
- BUGFIX: Use a pointing cursor over status bar buttons - BUGFIX: Use a pointing cursor over status bar buttons

View File

@@ -2203,7 +2203,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
QTorrentHandle h(p->handle); QTorrentHandle h(p->handle);
if(h.is_valid()) { if(h.is_valid()) {
// Attempt to remove old folder if empty // Attempt to remove old folder if empty
const QString& old_save_path = TorrentPersistentData::getPreviousPath(h.hash()); const QString old_save_path = TorrentPersistentData::getPreviousPath(h.hash());
const QString new_save_path = misc::toQStringU(p->path); const QString new_save_path = misc::toQStringU(p->path);
qDebug("Torrent moved from %s to %s", qPrintable(old_save_path), qPrintable(new_save_path)); qDebug("Torrent moved from %s to %s", qPrintable(old_save_path), qPrintable(new_save_path));
QDir old_save_dir(old_save_path); QDir old_save_dir(old_save_path);

View File

@@ -313,7 +313,7 @@ public:
// Save persistent data // Save persistent data
QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent-resume")); QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent-resume"));
QHash<QString, QVariant> all_data = settings.value("torrents", QHash<QString, QVariant>()).toHash(); QHash<QString, QVariant> all_data = settings.value("torrents", QHash<QString, QVariant>()).toHash();
QHash<QString, QVariant> data; QHash<QString, QVariant> data = all_data.value(h.hash()).toHash();
data["is_magnet"] = is_magnet; data["is_magnet"] = is_magnet;
if(is_magnet) { if(is_magnet) {
data["magnet_uri"] = misc::toQString(make_magnet_uri(h.get_torrent_handle())); data["magnet_uri"] = misc::toQString(make_magnet_uri(h.get_torrent_handle()));