ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2167 from JosJuice/language-selection-regression 

Call SetUserDirectory before InitLanguageSupport
This commit is contained in:
skidau 2015-03-06 15:25:51 +11:00
parent 47c8955248 2cb4a3efbc
commit a3f6cbfe6b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/Main.cpp
View File

@ -135,8 +135,6 @@ bool DolphinApp::OnInit()
Bind(wxEVT_QUERY_END_SESSION, &DolphinApp::OnEndSession, this); Bind(wxEVT_QUERY_END_SESSION, &DolphinApp::OnEndSession, this);
Bind(wxEVT_END_SESSION, &DolphinApp::OnEndSession, this); Bind(wxEVT_END_SESSION, &DolphinApp::OnEndSession, this);
InitLanguageSupport();
// Declarations and definitions // Declarations and definitions
bool UseDebugger = false; bool UseDebugger = false;
bool UseLogger = false; bool UseLogger = false;
@ -246,6 +244,7 @@ bool DolphinApp::OnInit()
UICommon::SetUserDirectory(userPath.ToStdString()); UICommon::SetUserDirectory(userPath.ToStdString());
UICommon::CreateDirectories(); UICommon::CreateDirectories();
InitLanguageSupport(); // The language setting is loaded from the user directory
UICommon::Init(); UICommon::Init();
if (selectPerfDir) if (selectPerfDir)