oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-17 17:08:39 +00:00
Code Wiki Activity

Fix server favorites not saving when client/serverlist/ doesn't exist already (#11152)

Browse source
This commit is contained in:
sfan5 2021-04-02 16:31:44 +02:00
parent 847860fc5c
commit e5f802ab5c
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/script/lua_api/l_mainmenu.cpp
View file

@ -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)))

2
src/script/lua_api/l_mainmenu.h
View file

@ -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