Add in pause settings can be ignored from torrent addition dialog

This commit is contained in:
Christophe Dumez
2010-01-20 08:37:53 +00:00
parent 9b40a036a7
commit 26b2367833
3 changed files with 5 additions and 4 deletions

View File

@@ -5,6 +5,7 @@
- BUGFIX: Nox version no longer requires libQtXml - BUGFIX: Nox version no longer requires libQtXml
- BUGFIX: Configure file now checks for pkg-config executable which is required - BUGFIX: Configure file now checks for pkg-config executable which is required
- BUGFIX: Torrents added from magnet links were not remembered on restart - BUGFIX: Torrents added from magnet links were not remembered on restart
- BUGFIX: "Add in pause" setting can be ignored from torrent addition dialog
* Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0 * Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0
- FEATURE: Graphical User Interface can be disabled at compilation time (headless running) - FEATURE: Graphical User Interface can be disabled at compilation time (headless running)

View File

@@ -802,7 +802,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
else else
p.storage_mode = storage_mode_sparse; p.storage_mode = storage_mode_sparse;
// Start in pause // Start in pause
p.paused = false; p.paused = true;
p.duplicate_is_error = false; // Already checked p.duplicate_is_error = false; // Already checked
p.auto_managed = false; // Because it is added in paused state p.auto_managed = false; // Because it is added in paused state
// Adding torrent to Bittorrent session // Adding torrent to Bittorrent session
@@ -853,7 +853,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
TorrentPersistentData::saveSavePath(hash, savePath); TorrentPersistentData::saveSavePath(hash, savePath);
} }
} }
if(!addInPause && !fastResume) { if(!fastResume && (!addInPause || Preferences::useAdditionDialog())) {
// Start torrent because it was added in paused state // Start torrent because it was added in paused state
h.resume(); h.resume();
} }
@@ -1056,7 +1056,7 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
// Copy it to torrentBackup directory // Copy it to torrentBackup directory
QFile::copy(file, newFile); QFile::copy(file, newFile);
} }
if(!addInPause && !fastResume) { if(!fastResume && (!addInPause || Preferences::useAdditionDialog())) {
// Start torrent because it was added in paused state // Start torrent because it was added in paused state
h.resume(); h.resume();
} }

View File

@@ -95,7 +95,7 @@ public:
savePathTxt->setText(Preferences::getSavePath()); savePathTxt->setText(Preferences::getSavePath());
if(Preferences::addTorrentsInPause()) { if(Preferences::addTorrentsInPause()) {
addInPause->setChecked(true); addInPause->setChecked(true);
addInPause->setEnabled(false); //addInPause->setEnabled(false);
} }
#ifndef LIBTORRENT_0_15 #ifndef LIBTORRENT_0_15
addInSeed->setVisible(false); addInSeed->setVisible(false);