From 383e6ac053fa98726310ec1f63966b6c99f103db Mon Sep 17 00:00:00 2001 From: luk3yx Date: Thu, 2 Jun 2022 10:02:51 +1200 Subject: [PATCH] Don't crash if a favorite server cannot be saved --- builtin/mainmenu/serverlistmgr.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua index 4023abf04..25acab17b 100644 --- a/builtin/mainmenu/serverlistmgr.lua +++ b/builtin/mainmenu/serverlistmgr.lua @@ -118,7 +118,9 @@ local function save_favorites(favorites) core.settings:set("serverlist_file", filename:sub(1, #filename - 4) .. ".json") end - assert(core.create_dir(get_favorites_path(true))) + if not core.create_dir(get_favorites_path(true)) then + core.log("error", "Failed to create favorites path") + end core.safe_file_write(get_favorites_path(), core.write_json(favorites)) end @@ -240,6 +242,10 @@ end -------------------------------------------------------------------------------- function serverlistmgr.add_favorite(new_favorite) + if new_favorite.address == nil or new_favorite.port == nil then + return + end + assert(type(new_favorite.port) == "number") -- Whitelist favorite keys