fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-16 23:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into c++11

Browse Source 
Conflicts:
	src/command_dynamic.cc
	src/command_events.cc
	src/command_groups.cc
	src/command_ip.cc
	src/command_network.cc
This commit is contained in:
rakshasa
2014-06-18 00:44:36 +09:00
parent 3b39f37f49 b8e24b78cd
commit dc8e786d58
14 changed files with 1292 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/control.cc
+4
View File
@@ -39,6 +39,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <torrent/connection_manager.h>
#include <torrent/utils/directory_events.h>
#include "core/manager.h"
#include "core/download_store.h"
@@ -67,6 +68,7 @@ Control::Control() :
m_commandScheduler(new rpc::CommandScheduler()),
m_objectStorage(new rpc::object_storage()),
m_directory_events(new torrent::directory_events()),
m_tick(0),
m_shutdownReceived(false),
@@ -94,6 +96,7 @@ Control::~Control() {
delete m_core;
delete m_dhtManager;
delete m_directory_events;
delete m_commandScheduler;
delete m_objectStorage;
}
@@ -167,6 +170,7 @@ Control::handle_shutdown() {
worker_thread->queue_item(&ThreadBase::stop_thread);
torrent::connection_manager()->listen_close();
m_directory_events->close();
m_core->shutdown(false);
if (!m_taskShutdown.is_queued())