Browse Source

- Exceptions to "Add Torrent is paused" setting can now be set in torrent addition dialog

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
8c6978be82
  1. 6
      src/bittorrent.cpp
  2. 2
      src/torrentadditiondlg.h

6
src/bittorrent.cpp

@ -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();
} }

2
src/torrentadditiondlg.h

@ -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);

Loading…
Cancel
Save