summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-11-25 21:07:50 +0100
committerCarl Hetherington <cth@carlh.net>2023-11-27 00:53:17 +0100
commitbf0cebd121a69f87a81e90e2cc64c08f32da6f7c (patch)
tree1c7af29929e4b58ff68ddf5e8d4ae04f62fa6cb2
parentb8ae9112b429f9cd18afc208cbbda942bc62d0b7 (diff)
Call dcpomatic_setup_path_encoding() early enough (#2665).
On Windows this was previously called after we instantiated a Config object to get win32_console(), meaning that the required path voodoo was not active when looking for the config. This caused problems if the user has a non-ASCII user name.
-rw-r--r--src/tools/dcpomatic.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 11181ae58..5bd8b8def 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1592,6 +1592,7 @@ public:
App ()
: wxApp ()
{
+ dcpomatic_setup_path_encoding ();
#ifdef DCPOMATIC_LINUX
XInitThreads ();
#endif
@@ -1644,8 +1645,6 @@ private:
make_foreground_application ();
#endif
- dcpomatic_setup_path_encoding ();
-
/* Enable i18n; this will create a Config object
to look for a force-configured language. This Config
object will be wrong, however, because dcpomatic_setup