From fcca0b751104eff40cdadca057cf59e5efcf5270 Mon Sep 17 00:00:00 2001 From: Singularis Date: Thu, 1 Feb 2024 13:33:33 +0000 Subject: [PATCH] fix for bugs #135 and #136 (#137) * fix for bugs #135 and #136 * Fix indentation in ui/compose.lua Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com> --------- Co-authored-by: Athozus Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com> --- ui/compose.lua | 9 ++------- ui/edit_maillists.lua | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ui/compose.lua b/ui/compose.lua index dff83bd..d78a10a 100644 --- a/ui/compose.lua +++ b/ui/compose.lua @@ -26,9 +26,7 @@ function mail.show_compose(name, to, subject, body, cc, bcc, id) minetest.formspec_escape(subject) or "", minetest.formspec_escape(body) or "") - if id then - mail.selected_idxs.message[name] = id - end + mail.selected_idxs.message[name] = id or mail.new_uuid() minetest.show_formspec(name, FORMNAME, formspec) end @@ -40,10 +38,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local name = player:get_player_name() if fields.send then - local id = mail.new_uuid() - if mail.selected_idxs.message[name] then - id = mail.selected_idxs.message[name] - end + local id = mail.selected_idxs.message[name] or mail.new_uuid() if (fields.to == "" and fields.cc == "" and fields.bcc == "") or fields.body == "" then -- if mail is invalid then store it as a draft mail.save_draft({ diff --git a/ui/edit_maillists.lua b/ui/edit_maillists.lua index 9ad3e38..a35ac1d 100644 --- a/ui/edit_maillists.lua +++ b/ui/edit_maillists.lua @@ -59,7 +59,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) desc = fields.desc, players = mail.parse_player_list(fields.players) }, old_maillist.name) - maillists[mail.selected_idxs.maillists[name]] = nil end else mail.update_maillist(name, {