diff options
author | George Hazan <ghazan@miranda.im> | 2018-04-27 21:54:19 +0200 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-04-27 21:55:09 +0200 |
commit | 23b0057349dddae70298c452db43fd9699780a05 (patch) | |
tree | 756c0708b8272abc21dc71d4d7bd80f8a602e815 | |
parent | 70f9524c663150e887f124be1209d77220c3619e (diff) |
fixes #1311 (Wrong langpack listed in VersionInfo)
-rw-r--r-- | plugins/CrashDumper/src/utils.cpp | 6 | ||||
-rw-r--r-- | src/mir_core/src/langpack.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/CrashDumper/src/utils.cpp b/plugins/CrashDumper/src/utils.cpp index 7a5e8b9d4f..b86fa072f6 100644 --- a/plugins/CrashDumper/src/utils.cpp +++ b/plugins/CrashDumper/src/utils.cpp @@ -363,11 +363,9 @@ void GetLanguagePackString(CMStringW &buffer) else
buffer.Append(lang);
}
- else
- buffer.Append(L"Locale id invalid");
+ else buffer.Append(L"Locale id invalid");
}
- else
- buffer.Append(L"No language pack installed");
+ else buffer.Append(L"No language pack installed");
}
void GetWow64String(CMStringW &buffer)
diff --git a/src/mir_core/src/langpack.cpp b/src/mir_core/src/langpack.cpp index 3fdd9f6d3d..7de71d4739 100644 --- a/src/mir_core/src/langpack.cpp +++ b/src/mir_core/src/langpack.cpp @@ -388,6 +388,10 @@ MIR_CORE_DLL(int) LoadLangPack(const wchar_t *ptszLangPack) if (g_entryCount)
UnloadLangPackModule();
+ langPack.Locale = 0;
+ langPack.codepage = CP_ACP;
+ langPack.flags = 0;
+
// exists & not a directory?
DWORD dwAttrib = GetFileAttributes(tszFullPath);
if (dwAttrib == INVALID_FILE_ATTRIBUTES || (dwAttrib & FILE_ATTRIBUTE_DIRECTORY))
|