diff options
author | George Hazan <ghazan@miranda.im> | 2018-05-22 22:40:02 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-05-22 22:40:02 +0300 |
commit | 09e90f29d43694f401d80d8d86140eb96c21558a (patch) | |
tree | 736989b2d49912d552f5e9fec11561a2496f7697 /src/mir_app | |
parent | e7ca07ff3871bb91337f50adce8274f0eee43f26 (diff) |
merge with master till
VKontakte: update VK_API to 5.76
Diffstat (limited to 'src/mir_app')
-rw-r--r-- | src/mir_app/src/srmm_toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp index 04877338b6..0f2cfe9595 100644 --- a/src/mir_app/src/srmm_toolbar.cpp +++ b/src/mir_app/src/srmm_toolbar.cpp @@ -99,7 +99,7 @@ MIR_APP_DLL(HANDLE) Srmm_AddButton(const BBButton *bbdi, int _hLang) cbd->m_bDisabled = (bbdi->bbbFlags & BBBF_DISABLED) != 0; cbd->m_bPushButton = (bbdi->bbbFlags & BBBF_ISPUSHBUTTON) != 0; - cbd->m_hLangpack = _hLang; + cbd->m_iLangId = _hLang; cbd->m_dwOrigFlags.bit1 = cbd->m_bRSided = (bbdi->bbbFlags & BBBF_ISRSIDEBUTTON) != 0; cbd->m_dwOrigFlags.bit2 = cbd->m_bIMButton = (bbdi->bbbFlags & BBBF_ISIMBUTTON) != 0; @@ -786,7 +786,7 @@ void KillModuleToolbarIcons(int _hLang) { auto T = arButtonsList.rev_iter(); for (auto &cbd : T) - if (cbd->m_hLangpack == _hLang) { + if (cbd->m_iLangId == _hLang) { delete cbd; arButtonsList.remove(T.indexOf(&cbd)); } |