From 0ec66e9024b7ac39f64dd02815b19c19b25c1430 Mon Sep 17 00:00:00 2001 From: Alden Torres Date: Tue, 24 Apr 2018 10:51:39 -0400 Subject: [PATCH] fix disk_io_thread::do_check_fastresume storage initialize logic from RC_1_1 merge --- src/disk_io_thread.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/disk_io_thread.cpp b/src/disk_io_thread.cpp index 93d534a92..6fe310bd8 100644 --- a/src/disk_io_thread.cpp +++ b/src/disk_io_thread.cpp @@ -2442,7 +2442,6 @@ constexpr disk_job_flags_t disk_interface::cache_hit; // the error message indicates that the fast resume data was rejected // if 'fatal_disk_error' is returned, the error message indicates what // when wrong in the disk access - storage_error se; if ((rd->have_pieces.empty() || !j->storage->verify_resume_data(*rd , links ? *links : aux::vector(), j->error)) @@ -2451,11 +2450,12 @@ constexpr disk_job_flags_t disk_interface::cache_hit; // j->error may have been set at this point, by verify_resume_data() // it's important to not have it cleared out subsequent calls, as long // as they succeed. - if (j->storage->has_any_file(se)) + storage_error ignore; + if (j->storage->has_any_file(ignore)) { // always initialize the storage - storage_error ignore; - j->storage->initialize(ignore); + storage_error se; + j->storage->initialize(se); if (se) { j->error = se; @@ -2465,6 +2465,7 @@ constexpr disk_job_flags_t disk_interface::cache_hit; } } + storage_error se; j->storage->initialize(se); if (se) {