From 70930b784fdc3839bbc78d0b9fd5242488d4ce90 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sat, 18 Jul 2026 22:18:01 +0300 Subject: [PATCH] =?UTF-8?q?chatgui:=20fix=20=E2=80=94=20=D0=BB=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=B0=D0=B4=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D0=B0=20=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=BB=D0=B8=D1=81=D1=8C=20(g=5Fcc.initialize?= =?UTF-8?q?d=20=D0=B4=D0=BE=20sync=5Fmy=5Faddresses)=20+=20=D1=82=D0=B0?= =?UTF-8?q?=D0=B9=D0=BC=D0=B0=D1=83=D1=82=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B1?= =?UTF-8?q?=D1=8D=D0=BA=2012=E2=86=9220=20=D0=B1=D0=B0=D0=B9=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/chatgui/transport/chat_core.c | 4 ++-- tools/chatgui/transport/chat_sync.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/chatgui/transport/chat_core.c b/tools/chatgui/transport/chat_core.c index 825259ec..4dcedff6 100644 --- a/tools/chatgui/transport/chat_core.c +++ b/tools/chatgui/transport/chat_core.c @@ -139,6 +139,8 @@ int chat_core_init(struct UTUN_INSTANCE* inst, const char* db_path) { } } + g_cc.initialized = 1; + chat_core_sync_my_addresses(); db_exec( @@ -198,8 +200,6 @@ int chat_core_init(struct UTUN_INSTANCE* inst, const char* db_path) { } } - g_cc.initialized = 1; - /* ensure infrastructure for all existing channels (survives restart) */ { sqlite3_stmt* stmt = NULL; diff --git a/tools/chatgui/transport/chat_sync.c b/tools/chatgui/transport/chat_sync.c index 2a15125f..130bb360 100644 --- a/tools/chatgui/transport/chat_sync.c +++ b/tools/chatgui/transport/chat_sync.c @@ -417,9 +417,10 @@ static void cs_info_req_timeout_cb(void* arg) { DEBUG_WARN(DEBUG_CATEGORY_DB_SYNC, "%s: CHANNEL_INFO_REQ timeout peer=%016llx ch=%llu", CS_ID, (unsigned long long)cs->pending_invite_node_id, (unsigned long long)cs->pending_invite_ch_id); - uint8_t err[12]; memcpy(err, &cs->pending_invite_node_id, 8); + uint8_t err[20]; memcpy(err, &cs->pending_invite_node_id, 8); int r = CC_ERR_TIMEOUT; memcpy(err + 8, &r, 4); - gui_bridge_post(GUI_EVT_CONNECT_RESULT, err, 12); + memcpy(err + 12, &cs->pending_invite_ch_id, 8); + gui_bridge_post(GUI_EVT_CONNECT_RESULT, err, 20); cs->pending_invite_node_id = 0; cs->pending_invite_ch_id = 0; }