diff options
| author | skidau <skidau@gmail.com> | 2015-03-06 15:25:51 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-06 15:25:51 +1100 |
| commit | a3f6cbfe6b6320439ea1770ccd6704048eb06c69 (patch) | |
| tree | 9d1f35bf3fdc78002e8979162b4cc28a786b9373 /Source/Core | |
| parent | 47c89552487ace069ed612d5c0c48df5a4d99542 (diff) | |
| parent | 2cb4a3efbcec838250c6861a90cf14e3b5f7295c (diff) | |
Merge pull request #2167 from JosJuice/language-selection-regression
Call SetUserDirectory before InitLanguageSupport
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index ecc7ca6e57..d644448589 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -135,8 +135,6 @@ bool DolphinApp::OnInit() Bind(wxEVT_QUERY_END_SESSION, &DolphinApp::OnEndSession, this); Bind(wxEVT_END_SESSION, &DolphinApp::OnEndSession, this); - InitLanguageSupport(); - // Declarations and definitions bool UseDebugger = false; bool UseLogger = false; @@ -246,6 +244,7 @@ bool DolphinApp::OnInit() UICommon::SetUserDirectory(userPath.ToStdString()); UICommon::CreateDirectories(); + InitLanguageSupport(); // The language setting is loaded from the user directory UICommon::Init(); if (selectPerfDir) |