squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-08 08:32:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors due to recent merge from master

Browse Source
This commit is contained in:
Christophe Dumez
2012-06-24 10:44:52 +03:00
parent 24a73c05b9
commit 4177a37d63
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainwindow.cpp
View File

@@ -997,9 +997,10 @@ void MainWindow::processNewMagnetLink(const QString& link)
{ {
QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool(); const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
if (useTorrentAdditionDialog) if (useTorrentAdditionDialog) {
AddNewTorrentDialog::showMagnet(link); torrentAdditionDialog *dialog = new torrentAdditionDialog(this);
else dialog->showLoadMagnetURI(link);
} else
QBtSession::instance()->addMagnetUri(link); QBtSession::instance()->addMagnetUri(link);
} }

6
src/rss/rss_imp.cpp
View File

@@ -327,11 +327,7 @@ void RSSImp::downloadTorrent() {
const RssArticle article = m_feedList->getRSSItemFromUrl(item->data(Article::FeedUrlRole).toString()) const RssArticle article = m_feedList->getRSSItemFromUrl(item->data(Article::FeedUrlRole).toString())
->getItem(item->data(Article::IdRole).toString()); ->getItem(item->data(Article::IdRole).toString());
QString torrentLink; QString torrentLink = article.hasAttachment() ? article.torrentUrl() : article.link();
if (article->hasAttachment())
torrentLink = article->torrentUrl();
else
torrentLink = article->link();
// Check if it is a magnet link // Check if it is a magnet link
if (torrentLink.startsWith("magnet:", Qt::CaseInsensitive)) if (torrentLink.startsWith("magnet:", Qt::CaseInsensitive))