diff options
author | George Hazan <ghazan@miranda.im> | 2018-05-19 14:10:37 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-05-19 14:10:37 +0300 |
commit | e7ca07ff3871bb91337f50adce8274f0eee43f26 (patch) | |
tree | 797ccbadd7699905e8fac8a5c0fbe1ed07a185a3 /src/mir_core/src/langpack.cpp | |
parent | 12c0a01bc1826949fa9e146b668a400cab679a63 (diff) |
merge with master till
fixes #1368 (Hide dbx_mmap from profile manager)
Diffstat (limited to 'src/mir_core/src/langpack.cpp')
-rw-r--r-- | src/mir_core/src/langpack.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mir_core/src/langpack.cpp b/src/mir_core/src/langpack.cpp index 7de71d4739..ffe7fd40f7 100644 --- a/src/mir_core/src/langpack.cpp +++ b/src/mir_core/src/langpack.cpp @@ -586,9 +586,9 @@ MIR_CORE_DLL(MUUID*) Langpack_LookupUuid(WPARAM wParam) return (idx > 0 && idx <= lMuuids.getCount()) ? lMuuids[idx - 1] : nullptr;
}
-MIR_CORE_DLL(int) Langpack_MarkPluginLoaded(PLUGININFOEX *pInfo)
+MIR_CORE_DLL(int) Langpack_MarkPluginLoaded(const MUUID &uuid)
{
- int idx = lMuuids.getIndex(&pInfo->uuid);
+ int idx = lMuuids.getIndex((MUUID*)&uuid);
if (idx == -1)
return 0;
@@ -686,7 +686,7 @@ void GetDefaultLang() MIR_CORE_DLL(void) mir_getLP(const PLUGININFOEX *pInfo, int *_hLang)
{
if (_hLang && pInfo)
- *(int*)_hLang = GetPluginLangId(pInfo->uuid, Langpack_MarkPluginLoaded((PLUGININFOEX*)pInfo));
+ *(int*)_hLang = GetPluginLangId(pInfo->uuid, Langpack_MarkPluginLoaded(pInfo->uuid));
}
/////////////////////////////////////////////////////////////////////////////////////////
|