diff options
| author | sfan5 <sfan5@live.de> | 2021-04-09 22:36:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 22:36:10 +0200 |
| commit | 0abc1e98edb87b2e23eecccfd6b1393ac7fb4f56 (patch) | |
| tree | f67a5afc1872850637c3e3c6bb698d36ec4f51b5 /src/script | |
| parent | a0e7a4a0df8fe49907abad2e28f9709d571386e1 (diff) | |
| download | minetest-0abc1e98edb87b2e23eecccfd6b1393ac7fb4f56.tar.gz minetest-0abc1e98edb87b2e23eecccfd6b1393ac7fb4f56.tar.bz2 minetest-0abc1e98edb87b2e23eecccfd6b1393ac7fb4f56.zip | |
Fix server favorites not saving when client/serverlist/ doesn't exist already (#11152)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/lua_api/l_mainmenu.cpp | 19 | ||||
| -rw-r--r-- | src/script/lua_api/l_mainmenu.h | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index 6826ece05..6488cd0fc 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -716,21 +716,24 @@ int ModApiMainMenu::l_get_mainmenu_path(lua_State *L) } /******************************************************************************/ -bool ModApiMainMenu::mayModifyPath(const std::string &path) +bool ModApiMainMenu::mayModifyPath(std::string path) { + path = fs::RemoveRelativePathComponents(path); + if (fs::PathStartsWith(path, fs::TempPath())) return true; - if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "games"))) - return true; + std::string path_user = fs::RemoveRelativePathComponents(porting::path_user); - if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "mods"))) + if (fs::PathStartsWith(path, path_user + DIR_DELIM "client")) return true; - - if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "textures"))) + if (fs::PathStartsWith(path, path_user + DIR_DELIM "games")) return true; - - if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "worlds"))) + if (fs::PathStartsWith(path, path_user + DIR_DELIM "mods")) + return true; + if (fs::PathStartsWith(path, path_user + DIR_DELIM "textures")) + return true; + if (fs::PathStartsWith(path, path_user + DIR_DELIM "worlds")) return true; if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_cache))) diff --git a/src/script/lua_api/l_mainmenu.h b/src/script/lua_api/l_mainmenu.h index 49ce7c251..33ac9e721 100644 --- a/src/script/lua_api/l_mainmenu.h +++ b/src/script/lua_api/l_mainmenu.h @@ -58,7 +58,7 @@ private: * @param path path to check * @return true if the path may be modified */ - static bool mayModifyPath(const std::string &path); + static bool mayModifyPath(std::string path); //api calls |