Fix AddTorrentData field types

This commit is contained in:
Vladimir Golovnev (Glassez) 2017-04-24 11:59:16 +03:00
parent f259bde275
commit 711be50e9c
3 changed files with 14 additions and 13 deletions

View file

@ -3372,8 +3372,8 @@ void Session::createTorrentHandle(const libt::torrent_handle &nativeHandle)
bool fromMagnetUri = !torrent->hasMetadata();
if (data.resumed) {
if (fromMagnetUri && (data.addPaused != TriStateBool::True))
torrent->resume(data.addForced == TriStateBool::True);
if (fromMagnetUri && !data.addPaused)
torrent->resume(data.addForced);
logger->addMessage(tr("'%1' resumed. (fast resume)", "'torrent name' was resumed. (fast resume)")
.arg(torrent->name()));
@ -3399,12 +3399,8 @@ void Session::createTorrentHandle(const libt::torrent_handle &nativeHandle)
if (isAddTrackersEnabled() && !torrent->isPrivate())
torrent->addTrackers(m_additionalTrackerList);
bool addPaused = (data.addPaused == TriStateBool::True);
if (data.addPaused == TriStateBool::Undefined)
addPaused = isAddTorrentPaused();
// Start torrent because it was added in paused state
if (!addPaused)
if (!data.addPaused)
torrent->resume();
logger->addMessage(tr("'%1' added to download list.", "'torrent name' was added to download list.")
.arg(torrent->name()));
@ -3664,8 +3660,8 @@ namespace
torrentData.hasRootFolder = fast.dict_find_int_value("qBt-hasRootFolder");
magnetUri = MagnetUri(QString::fromStdString(fast.dict_find_string_value("qBt-magnetUri")));
torrentData.addPaused = TriStateBool(fast.dict_find_int_value("qBt-paused"));
torrentData.addForced = TriStateBool(fast.dict_find_int_value("qBt-forced"));
torrentData.addPaused = fast.dict_find_int_value("qBt-paused");
torrentData.addForced = fast.dict_find_int_value("qBt-forced");
prio = fast.dict_find_int_value("qBt-queuePosition");