macOS: minor fixes
parent
0174b486f2
commit
95e1e263c6
|
@ -72,11 +72,9 @@ function serverlistmgr.sync()
|
|||
core.handle_async(
|
||||
function(param)
|
||||
local http = core.get_http_api()
|
||||
local url = ("%s%s?proto_version_min=%d&proto_version_max=%d"):format(
|
||||
local url = ("%s/list%s?proto_version_min=%d&proto_version_max=%d"):format(
|
||||
core.settings:get("serverlist_url"),
|
||||
(PLATFORM == "Android" or PLATFORM == "iOS") and
|
||||
core.decode_base64("OjMwMDAvc2VydmVybGlzdC5qc29u") or
|
||||
core.decode_base64("L2xpc3Q"),
|
||||
(PLATFORM == "Android" or PLATFORM == "iOS" or PLATFORM == "OSX") and "_prod" or "",
|
||||
core.get_min_supp_proto(),
|
||||
core.get_max_supp_proto())
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ void init_gettext(const char *path, const std::string &configured_language,
|
|||
// Add user specified locale to environment
|
||||
setenv("LANGUAGE", configured_language.c_str(), 1);
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#if defined(__ANDROID__) || defined(__APPLE__)
|
||||
setenv("LANG", configured_language.c_str(), 1);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -804,7 +804,7 @@ static bool determine_subgame(GameParams *game_params)
|
|||
gamespec = findSubgame(g_settings->get("default_game"));
|
||||
infostream << "Using default gameid [" << gamespec.id << "]" << std::endl;
|
||||
if (!gamespec.isValid()) {
|
||||
errorstream << "Game specified in default_game ["
|
||||
warningstream << "Game specified in default_game ["
|
||||
<< g_settings->get("default_game")
|
||||
<< "] is invalid." << std::endl;
|
||||
return false;
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 428 B |
Loading…
Reference in New Issue