squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 15:07:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up QBtSession destructor code

Browse Source
This commit is contained in:
Christophe Dumez
2010-11-22 19:14:50 +00:00
parent ee3d4ce8f1
commit efe5e7b068
2 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/qtlibtorrent/qbtsession.cpp
View File

@@ -81,7 +81,7 @@ QBtSession::QBtSession()
preAllocateAll(false), addInPause(false), ratio_limit(-1), preAllocateAll(false), addInPause(false), ratio_limit(-1),
UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false),
DHTEnabled(false), current_dht_port(0), queueingEnabled(false), DHTEnabled(false), current_dht_port(0), queueingEnabled(false),
torrentExport(false), exiting(false) torrentExport(false)
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
, geoipDBLoaded(false), resolve_countries(false) , geoipDBLoaded(false), resolve_countries(false)
#endif #endif
@@ -143,37 +143,15 @@ QBtSession::QBtSession()
qDebug("* BTSession constructed"); qDebug("* BTSession constructed");
} }
session_proxy QBtSession::asyncDeletion() { // Main destructor
qDebug("Bittorrent session async deletion IN"); QBtSession::~QBtSession() {
exiting = true; qDebug("BTSession destructor IN");
// Do some BT related saving // Do some BT related saving
#if LIBTORRENT_VERSION_MINOR < 15 #if LIBTORRENT_VERSION_MINOR < 15
saveDHTEntry(); saveDHTEntry();
#endif #endif
saveSessionState(); saveSessionState();
saveFastResumeData(); saveFastResumeData();
// Delete session
session_proxy sp = s->abort();
delete s;
qDebug("Bittorrent session async deletion OUT");
return sp;
}
// Main destructor
QBtSession::~QBtSession() {
qDebug("BTSession destructor IN");
if(!exiting) {
// Do some BT related saving
#if LIBTORRENT_VERSION_MINOR < 15
saveDHTEntry();
#endif
saveSessionState();
saveFastResumeData();
qDebug("Deleting the session");
// Delete session
session_proxy sp = s->abort();
delete s;
}
// Delete our objects // Delete our objects
if(m_tracker) if(m_tracker)
delete m_tracker; delete m_tracker;
@@ -190,6 +168,9 @@ QBtSession::~QBtSession() {
delete httpServer; delete httpServer;
if(timerETA) if(timerETA)
delete timerETA; delete timerETA;
// Delete session
qDebug("Deleting the session");
delete s;
qDebug("BTSession destructor OUT"); qDebug("BTSession destructor OUT");
} }

3
src/qtlibtorrent/qbtsession.h
View File

@@ -108,7 +108,6 @@ public slots:
void downloadFromUrl(QString url); void downloadFromUrl(QString url);
void deleteTorrent(QString hash, bool delete_local_files = false); void deleteTorrent(QString hash, bool delete_local_files = false);
void startUpTorrents(); void startUpTorrents();
session_proxy asyncDeletion();
void recheckTorrent(QString hash); void recheckTorrent(QString hash);
void useAlternativeSpeedsLimit(bool alternative); void useAlternativeSpeedsLimit(bool alternative);
/* Needed by Web UI */ /* Needed by Web UI */
@@ -257,8 +256,6 @@ private:
// Web UI // Web UI
QPointer<HttpServer> httpServer; QPointer<HttpServer> httpServer;
QList<QUrl> url_skippingDlg; QList<QUrl> url_skippingDlg;
// Fast exit (async)
bool exiting;
// GeoIP // GeoIP
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
bool geoipDBLoaded; bool geoipDBLoaded;