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

Merge branch 'master' into c++11

Browse Source
This commit is contained in:
Jari Sundell
2011-11-26 01:44:52 +09:00
parent 58727fe7fd 6c10f7e05d
commit 9a9dcb88f7
9 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/curl_get.h
+2
View File
@@ -51,6 +51,8 @@ class CurlStack;
class CurlGet : public torrent::Http {
public:
friend class CurlStack;
CurlGet(CurlStack* s) : m_active(false), m_handle(NULL), m_stack(s) {}
virtual ~CurlGet();
src/core/curl_stack.cc
+2 -2
View File
@@ -131,9 +131,9 @@ CurlStack::transfer_done(void* handle, const char* msg) {
throw torrent::internal_error("Could not find CurlGet with the right easy_handle.");
if (msg == NULL)
torrent::slot_list_call((*itr)->signal_done());
(*itr)->trigger_done();
else
torrent::slot_list_call((*itr)->signal_failed(), msg);
(*itr)->trigger_failed(msg);
}
void