Merge branch 'optimize-persistent-data' of git://github.com/sorokin/qBittorrent

Conflicts:
	src/qtlibtorrent/qbtsession.cpp
This commit is contained in:
sledgehammer999 2015-01-27 15:21:26 +02:00
commit dcf5d4d0ee
10 changed files with 165 additions and 152 deletions

View file

@ -63,7 +63,6 @@
#include "preferences.h"
#include "trackerlist.h"
#include "peerlistwidget.h"
#include "torrentpersistentdata.h"
#include "transferlistfilterswidget.h"
#include "propertieswidget.h"
#include "statusbar.h"
@ -668,7 +667,7 @@ void MainWindow::balloonClicked()
// called when a torrent has finished
void MainWindow::finishedTorrent(const QTorrentHandle& h) const
{
if (TorrentPersistentData::isSeed(h.hash()))
if (TorrentPersistentData::instance().isSeed(h.hash()))
showNotificationBaloon(tr("Download completion"), tr("%1 has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(h.name()));
}