From 6eed344aac88e74f4445c2b3aed0b560b3e90912 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Mon, 1 Apr 2024 02:34:47 +0200 Subject: [PATCH 1/2] New translations en.json (Chinese Simplified) --- data/zh_CN.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/zh_CN.json b/data/zh_CN.json index 146e267b..aeced869 100644 --- a/data/zh_CN.json +++ b/data/zh_CN.json @@ -86,13 +86,13 @@ "ssid": "SSID" }, "wg": { - "title": "WireGuard Settings", - "btn": "WireGuard Settings", + "title": "WireGuard 设置", + "btn": "WireGuard 设置", "vpnip": "VPN IP", - "privkey": "Private Key", - "host": "Remote IP", - "port": "Remote Port", - "pubkey": "Remote Public Key" + "privkey": "专用密钥", + "host": "远程IP", + "port": "删除", + "pubkey": "远程公钥" }, "mqtt": { "title": "MQTT 设置", From 3884b7b3f4b7953cbfb69d71228b9aafa2f05d05 Mon Sep 17 00:00:00 2001 From: marsman7 Date: Mon, 1 Apr 2024 15:28:08 +0200 Subject: [PATCH 2/2] fix: improve memory leaks on delete --- lib/lv_lib_qrcode/lv_qrcode.c | 1 - src/hasp/hasp_object.cpp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lv_lib_qrcode/lv_qrcode.c b/lib/lv_lib_qrcode/lv_qrcode.c index 54fe4b1c..4e19c35c 100644 --- a/lib/lv_lib_qrcode/lv_qrcode.c +++ b/lib/lv_lib_qrcode/lv_qrcode.c @@ -321,7 +321,6 @@ void lv_qrcode_delete(lv_obj_t* qrcode) lv_img_dsc_t* img = lv_canvas_get_img(qrcode); lv_mem_free(img->data); lv_mem_free(img); - lv_obj_del(qrcode); } /********************** diff --git a/src/hasp/hasp_object.cpp b/src/hasp/hasp_object.cpp index c8b989ce..ae89b425 100644 --- a/src/hasp/hasp_object.cpp +++ b/src/hasp/hasp_object.cpp @@ -381,6 +381,7 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id) case HASP_OBJ_QRCODE: obj = lv_qrcode_create(parent_obj, 140, LV_COLOR_BLACK, LV_COLOR_WHITE); if(obj) { + lv_obj_set_event_cb(obj, delete_event_handler); obj->user_data.objid = LV_HASP_QRCODE; } break;