Skip to content

Commit

Permalink
Set fixed locale for numbers, close to config read/write (libretro#15782
Browse files Browse the repository at this point in the history
)

Move setlocale() closer to config file read/write.
  • Loading branch information
zoltanvb authored and Sunderland93 committed Dec 26, 2024
1 parent e46b00c commit 3e5d453
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions command.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <locale.h>
#ifdef HAVE_NETWORKING
#include <net/net_compat.h>
#include <net/net_socket.h>
Expand Down Expand Up @@ -1166,6 +1167,10 @@ bool command_event_save_config(
const char *str = path_exists ? config_path :
path_get(RARCH_PATH_CONFIG);

/* Workaround for libdecor 0.2.0 setting unwanted locale */
#if defined(HAVE_WAYLAND) && defined(HAVE_DYNAMIC)
setlocale(LC_NUMERIC,"C");
#endif
if (path_exists && config_save_file(config_path))
{
snprintf(s, len, "%s \"%s\".",
Expand Down
4 changes: 4 additions & 0 deletions retroarch.c
Original file line number Diff line number Diff line change
Expand Up @@ -5917,6 +5917,10 @@ static bool retroarch_parse_input_and_config(
if (!(p_rarch->flags & RARCH_FLAGS_BLOCK_CONFIG_READ))
#endif
{
/* Workaround for libdecor 0.2.0 setting unwanted locale */
#if defined(HAVE_WAYLAND) && defined(HAVE_DYNAMIC)
setlocale(LC_NUMERIC,"C");
#endif
/* If this is a static build, load salamander
* config file first (sets RARCH_PATH_CORE) */
#if !defined(HAVE_DYNAMIC)
Expand Down

0 comments on commit 3e5d453

Please sign in to comment.