diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index abc8e9394..c17dad322 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -505,14 +505,12 @@ void set_default_settings() settings->setDefault("enable_shaders", "false"); settings->setDefault("serverlist_url", "servers.multicraft.world"); - settings->setDefault("TMPFolder", porting::path_cache); #endif // Mobile Platform #if defined(__ANDROID__) || defined(__IOS__) settings->setDefault("fullscreen", "true"); settings->setDefault("touchtarget", "true"); - settings->setDefault("TMPFolder", porting::path_cache); settings->setDefault("touchscreen_threshold", "20"); settings->setDefault("fixed_virtual_joystick", "true"); settings->setDefault("virtual_joystick_triggers_aux", "false"); diff --git a/src/filesys.cpp b/src/filesys.cpp index 15e2b51f7..191345b97 100644 --- a/src/filesys.cpp +++ b/src/filesys.cpp @@ -27,9 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "config.h" #include "porting.h" -#if defined(__ANDROID__) || defined(__IOS__) -#include "settings.h" // For g_settings -#endif namespace fs { @@ -359,8 +356,8 @@ std::string TempPath() compatible with lua's os.tmpname which under the default configuration hardcodes mkstemp("/tmp/lua_XXXXXX"). */ -#if defined(__ANDROID__) || defined(__IOS__) - return g_settings->get("TMPFolder"); +#if defined(__ANDROID__) || defined(__APPLE__) + return porting::path_cache; #else return DIR_DELIM "tmp"; #endif