From 20630e91ec4ff340db3b7475b68bd0800b80bd08 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 1 Dec 2010 19:05:26 +0000 Subject: [PATCH] Simplified addMagnetUri function --- src/qtlibtorrent/qbtsession.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp index 9686c248f..fc1e71051 100644 --- a/src/qtlibtorrent/qbtsession.cpp +++ b/src/qtlibtorrent/qbtsession.cpp @@ -854,17 +854,6 @@ QTorrentHandle QBtSession::addMagnetUri(QString magnet_uri, bool resumed) { add_torrent_params p = initializeAddTorrentParams(hash); - //Getting fast resume data if existing - bool fastResume = false; - std::vector buf; // Needs to stay in the function scope - if(resumed) { - if(loadFastResumeData(hash, buf)) { - fastResume = true; - p.resume_data = &buf; - qDebug("Successfully loaded fast resume data"); - } - } - // Get save path QString torrent_name = misc::magnetUriToName(magnet_uri); const QString savePath(getSavePath(hash, false, QString::null, torrent_name)); @@ -909,15 +898,12 @@ QTorrentHandle QBtSession::addMagnetUri(QString magnet_uri, bool resumed) { if(!resumed) { loadTorrentTempData(h, savePath, true); } - if(!fastResume && (!addInPause || (Preferences().useAdditionDialog()))) { + if(!addInPause || (Preferences().useAdditionDialog())) { // Start torrent because it was added in paused state h.resume(); } // Send torrent addition signal - if(fastResume) - addConsoleMessage(tr("'%1' resumed. (fast resume)", "'/home/y/xxx.torrent' was resumed. (fast resume)").arg(magnet_uri)); - else - addConsoleMessage(tr("'%1' added to download list.", "'/home/y/xxx.torrent' was added to download list.").arg(magnet_uri)); + addConsoleMessage(tr("'%1' added to download list.", "'/home/y/xxx.torrent' was added to download list.").arg(magnet_uri)); emit addedTorrent(h); return h; }