# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1383175105 14400
# Node ID ef4fc092c86b8b60660e03edf4cf2e65eee875b0
# Parent  6da521da1c700f7de39629041fdc1fc6a7bfcf04
set LC_NUMERIC local to "C" for CLI and GUI (bug #40422)

* octave.cc (octave_initialize_interpreter): Set LC_NUMERIC here.
* octave-main-thread.cc (octave_main_thread::run): Not here.

diff --git a/libgui/src/octave-main-thread.cc b/libgui/src/octave-main-thread.cc
--- a/libgui/src/octave-main-thread.cc
+++ b/libgui/src/octave-main-thread.cc
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include <clocale>
 #include <string>
 
 #include "builtin-defun-decls.h"
@@ -39,9 +38,6 @@
 void
 octave_main_thread::run (void)
 {
-  // Matlab uses "C" locale for LC_NUMERIC class regardless of local setting
-  setlocale (LC_NUMERIC, "C");
-
   octave_initialize_interpreter (octave_cmdline_argc, octave_cmdline_argv,
                                  octave_embedded);
 
diff --git a/libinterp/octave.cc b/libinterp/octave.cc
--- a/libinterp/octave.cc
+++ b/libinterp/octave.cc
@@ -27,6 +27,7 @@
 #endif
 
 #include <cassert>
+#include <clocale>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
@@ -704,6 +705,9 @@
 void
 octave_initialize_interpreter (int argc, char **argv, int embedded)
 {
+  // Matlab uses "C" locale for LC_NUMERIC class regardless of local setting
+  setlocale (LC_NUMERIC, "C");
+
   octave_embedded = embedded;
 
   octave_env::set_program_name (argv[0]);