github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 21:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #6630 from evsh/fix-6454

Browse source 
Start up torrents after UI was created. Fixes #6454.
This commit is contained in:
sledgehammer999 2017-04-17 16:44:03 +03:00 • committed by GitHub
commit c27108c97a
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app/application.cpp
View file

@ -462,6 +462,9 @@ int Application::exec(const QStringList &params)
m_paramsQueue.clear(); m_paramsQueue.clear();
} }
// Now UI is ready to process signals from Session
BitTorrent::Session::instance()->startUpTorrents();
return BaseApplication::exec(); return BaseApplication::exec();
} }

1
src/base/bittorrent/session.cpp
View file

@ -441,7 +441,6 @@ Session::Session(QObject *parent)
Net::PortForwarder::initInstance(m_nativeSession); Net::PortForwarder::initInstance(m_nativeSession);
qDebug("* BitTorrent Session constructed"); qDebug("* BitTorrent Session constructed");
startUpTorrents();
} }
bool Session::isDHTEnabled() const bool Session::isDHTEnabled() const

2
src/base/bittorrent/session.h
View file

@ -333,6 +333,7 @@ namespace BitTorrent
QStringList bannedIPs() const; QStringList bannedIPs() const;
void setBannedIPs(const QStringList &list); void setBannedIPs(const QStringList &list);
void startUpTorrents();
TorrentHandle *findTorrent(const InfoHash &hash) const; TorrentHandle *findTorrent(const InfoHash &hash) const;
QHash<InfoHash, TorrentHandle *> torrents() const; QHash<InfoHash, TorrentHandle *> torrents() const;
TorrentStatusReport torrentStatusReport() const; TorrentStatusReport torrentStatusReport() const;
@ -463,7 +464,6 @@ namespace BitTorrent
void enableIPFilter(); void enableIPFilter();
void disableIPFilter(); void disableIPFilter();
void startUpTorrents();
bool addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri, bool addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
TorrentInfo torrentInfo = TorrentInfo(), TorrentInfo torrentInfo = TorrentInfo(),
const QByteArray &fastresumeData = QByteArray()); const QByteArray &fastresumeData = QByteArray());