mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 18:56:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Start up torrents after UI was created. Fixes #6454.

Browse source 
Commit dd0537d changed torrents startup code adding alerts processing
into it. Therefore alerts were processed before UI code subscribed to
signals and therefore part of alerts was not reflected in the UI.

Thus here we do not start torrents in Session constructor, but do that
from Application::exec() after UI was constructed and is ready to process
signals.
This commit is contained in:
Eugene Shalygin 2017-04-14 00:43:09 +02:00 committed by sledgehammer999
parent ef08b4269d
commit b8eee9e1b8
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/app/application.cpp
View file

@ -441,6 +441,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

@ -425,7 +425,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

@ -327,6 +327,7 @@ namespace BitTorrent
bool isTrackerFilteringEnabled() const; bool isTrackerFilteringEnabled() const;
void setTrackerFilteringEnabled(bool enabled); void setTrackerFilteringEnabled(bool enabled);
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;
@ -457,7 +458,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());