Merge branch 'dont-save-control-file'

pull/921/head
Tatsuhiro Tsujikawa 2017-05-21 18:11:13 +09:00
commit 9f50d7353c
2 changed files with 9 additions and 6 deletions

View File

@ -82,11 +82,13 @@ void BtFileAllocationEntry::prepareForNextAction(
rg->createNextCommandWithAdj(commands, e, 0);
}
try {
rg->saveControlFile();
}
catch (RecoverableException& e) {
A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e);
if (option->getAsInt(PREF_AUTO_SAVE_INTERVAL) != 0) {
try {
rg->saveControlFile();
}
catch (RecoverableException& e) {
A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e);
}
}
}
else {

View File

@ -99,7 +99,8 @@ void StreamFileAllocationEntry::prepareForNextAction(
rg->createNextCommandWithAdj(commands, e, 0);
}
if (!rg->allDownloadFinished()) {
if (option->getAsInt(PREF_AUTO_SAVE_INTERVAL) != 0 &&
!rg->allDownloadFinished()) {
try {
rg->saveControlFile();
}