mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-10-22 10:46:04 +03:00
Fix compilation errors due to recent merge from master
This commit is contained in:
parent
24a73c05b9
commit
4177a37d63
2 changed files with 5 additions and 8 deletions
|
@ -997,9 +997,10 @@ void MainWindow::processNewMagnetLink(const QString& link)
|
|||
{
|
||||
QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
|
||||
const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
|
||||
if (useTorrentAdditionDialog)
|
||||
AddNewTorrentDialog::showMagnet(link);
|
||||
else
|
||||
if (useTorrentAdditionDialog) {
|
||||
torrentAdditionDialog *dialog = new torrentAdditionDialog(this);
|
||||
dialog->showLoadMagnetURI(link);
|
||||
} else
|
||||
QBtSession::instance()->addMagnetUri(link);
|
||||
}
|
||||
|
||||
|
|
|
@ -327,11 +327,7 @@ void RSSImp::downloadTorrent() {
|
|||
const RssArticle article = m_feedList->getRSSItemFromUrl(item->data(Article::FeedUrlRole).toString())
|
||||
->getItem(item->data(Article::IdRole).toString());
|
||||
|
||||
QString torrentLink;
|
||||
if (article->hasAttachment())
|
||||
torrentLink = article->torrentUrl();
|
||||
else
|
||||
torrentLink = article->link();
|
||||
QString torrentLink = article.hasAttachment() ? article.torrentUrl() : article.link();
|
||||
|
||||
// Check if it is a magnet link
|
||||
if (torrentLink.startsWith("magnet:", Qt::CaseInsensitive))
|
||||
|
|
Loading…
Reference in a new issue