andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix finishFileGeneration with error result.

Browse Source 
GitOrigin-RevId: b4d766d6832820eb8480d09444a167bd11bc95a3
This commit is contained in:
levlam 2018-08-29 13:44:21 +03:00
parent 6439cf8567
commit 2b72a74ab7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
td/telegram/files/FileGenerateManager.cpp
View File

@ -246,7 +246,12 @@ class FileExternalGenerateActor : public FileGenerateActor {
check_status(do_file_generate_progress(expected_size, local_prefix_size), std::move(promise)); check_status(do_file_generate_progress(expected_size, local_prefix_size), std::move(promise));
} }
void file_generate_finish(Status status, Promise<> promise) override { void file_generate_finish(Status status, Promise<> promise) override {
check_status(do_file_generate_finish(std::move(status)), std::move(promise)); if (status.is_error()) {
check_status(std::move(status));
return promise.set_value(Unit());
}
check_status(do_file_generate_finish(), std::move(promise));
} }
private: private:
@ -297,9 +302,7 @@ class FileExternalGenerateActor : public FileGenerateActor {
return Status::OK(); return Status::OK();
} }
Status do_file_generate_finish(Status status) { Status do_file_generate_finish() {
TRY_STATUS(std::move(status));
auto dir = get_files_dir(generate_location_.file_type_); auto dir = get_files_dir(generate_location_.file_type_);
TRY_RESULT(perm_path, create_from_temp(path_, dir, name_)); TRY_RESULT(perm_path, create_from_temp(path_, dir, name_));