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

Merge pull request #1053 from aria2/fix-libaria2-signal-handler 

Fix bug that signal handler does not work with libaria2
pull/1057/head
Tatsuhiro Tsujikawa 2017-11-01 00:44:35 +09:00 committed by GitHub
parent 450b4f467f 85b102a2a0
commit d508e41198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/DownloadEngine.cc
View File

@ -150,14 +150,22 @@ void executeCommand(std::deque<std::unique_ptr<Command>>& commands,
namespace { namespace {
class GlobalHaltRequestedFinalizer { class GlobalHaltRequestedFinalizer {
public: public:
GlobalHaltRequestedFinalizer() = default; GlobalHaltRequestedFinalizer(bool oneshot) : oneshot_(oneshot) {}
~GlobalHaltRequestedFinalizer() { global::globalHaltRequested = 5; } ~GlobalHaltRequestedFinalizer()
{
if (!oneshot_) {
global::globalHaltRequested = 5;
}
}
private:
bool oneshot_;
}; };
} // namespace } // namespace
int DownloadEngine::run(bool oneshot) int DownloadEngine::run(bool oneshot)
{ {
GlobalHaltRequestedFinalizer ghrf; GlobalHaltRequestedFinalizer ghrf(oneshot);
while (!commands_.empty() || !routineCommands_.empty()) { while (!commands_.empty() || !routineCommands_.empty()) {
if (!commands_.empty()) { if (!commands_.empty()) {
waitData(); waitData();