tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return previous actor context before stopping Td just in case.

Browse Source 
GitOrigin-RevId: 1737f25bd1990fbffe16c075c87cbfa23b3e0d85
This commit is contained in:
levlam 2020-09-02 23:35:54 +03:00
parent d46fa34869
commit 39a42bfd74
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
td/telegram/Td.cpp
View File

@ -3007,6 +3007,7 @@ class SetBackgroundRequest : public RequestActor<> {
Td::Td(unique_ptr<TdCallback> callback, Options options) Td::Td(unique_ptr<TdCallback> callback, Options options)
: callback_(std::move(callback)), td_options_(std::move(options)) { : callback_(std::move(callback)), td_options_(std::move(options)) {
CHECK(callback_ != nullptr);
} }
Td::~Td() = default; Td::~Td() = default;
@ -3724,7 +3725,7 @@ void Td::start_up() {
} }
VLOG(td_init) << "Create Global"; VLOG(td_init) << "Create Global";
set_context(std::make_shared<Global>()); old_context_ = set_context(std::make_shared<Global>());
G()->set_net_query_stats(td_options_.net_query_stats); G()->set_net_query_stats(td_options_.net_query_stats);
inc_request_actor_refcnt(); // guard inc_request_actor_refcnt(); // guard
inc_actor_refcnt(); // guard inc_actor_refcnt(); // guard
@ -3847,6 +3848,7 @@ void Td::dec_stop_cnt() {
stop_cnt_--; stop_cnt_--;
if (stop_cnt_ == 0) { if (stop_cnt_ == 0) {
LOG(WARNING) << "Stop Td"; LOG(WARNING) << "Stop Td";
set_context(std::move(old_context_));
stop(); stop();
} }
} }
@ -4512,7 +4514,6 @@ void Td::send_result(uint64 id, tl_object_ptr<td_api::Object> object) {
void Td::send_error_impl(uint64 id, tl_object_ptr<td_api::error> error) { void Td::send_error_impl(uint64 id, tl_object_ptr<td_api::error> error) {
CHECK(id != 0); CHECK(id != 0);
CHECK(callback_ != nullptr);
CHECK(error != nullptr); CHECK(error != nullptr);
auto it = request_set_.find(id); auto it = request_set_.find(id);
if (it != request_set_.end()) { if (it != request_set_.end()) {

2
td/telegram/Td.h
View File

@ -347,6 +347,8 @@ class Td final : public NetQueryCallback {
std::shared_ptr<UploadFileCallback> upload_file_callback_; std::shared_ptr<UploadFileCallback> upload_file_callback_;
std::shared_ptr<ActorContext> old_context_;
static int *get_log_verbosity_level(Slice name); static int *get_log_verbosity_level(Slice name);
template <class T> template <class T>