github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Ensure that Commands are cleaned up before RequestGroupMan is deleted

pull/131/merge
Tatsuhiro Tsujikawa 2013-09-25 23:35:18 +09:00
parent e3e4ff700a
commit 77b7747ca8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/DownloadEngine.h
View File

@ -131,8 +131,6 @@ private:
int64_t refreshInterval_; int64_t refreshInterval_;
Timer lastRefresh_; Timer lastRefresh_;
std::deque<std::unique_ptr<Command>> routineCommands_;
std::unique_ptr<CookieStorage> cookieStorage_; std::unique_ptr<CookieStorage> cookieStorage_;
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
@ -167,11 +165,14 @@ private:
std::multimap<std::string, SocketPoolEntry>::iterator std::multimap<std::string, SocketPoolEntry>::iterator
findSocketPoolEntry(const std::string& key); findSocketPoolEntry(const std::string& key);
std::deque<std::unique_ptr<Command>> commands_;
std::unique_ptr<RequestGroupMan> requestGroupMan_; std::unique_ptr<RequestGroupMan> requestGroupMan_;
std::unique_ptr<FileAllocationMan> fileAllocationMan_; std::unique_ptr<FileAllocationMan> fileAllocationMan_;
std::unique_ptr<CheckIntegrityMan> checkIntegrityMan_; std::unique_ptr<CheckIntegrityMan> checkIntegrityMan_;
Option* option_; Option* option_;
// Ensure that Commands are cleaned up before requestGroupMan_ is
// deleted.
std::deque<std::unique_ptr<Command>> routineCommands_;
std::deque<std::unique_ptr<Command>> commands_;
public: public:
DownloadEngine(std::unique_ptr<EventPoll> eventPoll); DownloadEngine(std::unique_ptr<EventPoll> eventPoll);