From f8342527ca070fe06e3a8523904bbde536bb9644 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 28 Feb 2024 13:47:17 +0300 Subject: [PATCH] Don't resave DcOptions on launch. --- td/telegram/net/ConnectionCreator.cpp | 6 +++++- td/telegram/net/ConnectionCreator.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/td/telegram/net/ConnectionCreator.cpp b/td/telegram/net/ConnectionCreator.cpp index 413d5b70a..5d0473cba 100644 --- a/td/telegram/net/ConnectionCreator.cpp +++ b/td/telegram/net/ConnectionCreator.cpp @@ -1033,6 +1033,10 @@ void ConnectionCreator::on_dc_options(DcOptions new_dc_options) { VLOG(connections) << "SAVE " << new_dc_options; G()->td_db()->get_binlog_pmc()->set("dc_options", serialize(new_dc_options)); dc_options_set_.reset(); + add_dc_options(std::move(new_dc_options)); +} + +void ConnectionCreator::add_dc_options(DcOptions &&new_dc_options) { dc_options_set_.add_dc_options(get_default_dc_options(G()->is_test_dc())); #if !TD_EMSCRIPTEN // FIXME dc_options_set_.add_dc_options(std::move(new_dc_options)); @@ -1091,7 +1095,7 @@ void ConnectionCreator::start_up() { if (status.is_error()) { on_dc_options(DcOptions()); } else { - on_dc_options(std::move(dc_options)); + add_dc_options(std::move(dc_options)); } if (G()->td_db()->get_binlog_pmc()->get("proxy_max_id") != "2" || diff --git a/td/telegram/net/ConnectionCreator.h b/td/telegram/net/ConnectionCreator.h index 245324bd8..e210feeb9 100644 --- a/td/telegram/net/ConnectionCreator.h +++ b/td/telegram/net/ConnectionCreator.h @@ -206,7 +206,7 @@ class ConnectionCreator final : public NetQueryCallback { void loop() final; void init_proxies(); - void save_dc_options(); + void add_dc_options(DcOptions &&new_dc_options); Result do_request_connection(DcId dc_id, bool allow_media_only); Result, bool>> do_request_raw_connection(DcId dc_id, bool allow_media_only,