Fix loading localization file (-L) not working regression

This commit is contained in:
Don HO 2020-02-15 04:52:46 +01:00
parent f3261f8620
commit 1c55e0daa7
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E

View File

@ -411,6 +411,13 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR pCmdLine, int)
::MessageBox(NULL, COMMAND_ARG_HELP, TEXT("Notepad++ Command Argument Help"), MB_OK);
NppParameters& nppParameters = NppParameters::getInstance();
if (cmdLineParams._localizationPath != TEXT(""))
{
// setStartWithLocFileName() should be called before parameters are loaded
nppParameters.setStartWithLocFileName(cmdLineParams._localizationPath);
}
nppParameters.load();
NppGUI & nppGui = const_cast<NppGUI &>(nppParameters.getNppGUI());
@ -424,11 +431,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR pCmdLine, int)
cmdLineParams._isNoSession = true;
}
if (cmdLineParams._localizationPath != TEXT(""))
{
nppParameters.setStartWithLocFileName(cmdLineParams._localizationPath);
}
nppParameters.setFunctionListExportBoolean(doFunctionListExport);
nppParameters.setPrintAndExitBoolean(doPrintAndQuit);