summaryrefslogtreecommitdiff
path: root/plugins/ChangeKeyboardLayout/src/hook_events.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ChangeKeyboardLayout/src/hook_events.cpp')
-rw-r--r--plugins/ChangeKeyboardLayout/src/hook_events.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index b72f16046e..7acb1ce6ef 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -93,16 +93,12 @@ int OnIconsChanged(WPARAM, LPARAM)
int ModulesLoaded(WPARAM, LPARAM)
{
- LPCTSTR ptszEmptySting = L"";
-
// Заполняем конфигурационные строки из базы. Если их там нет - генерируем.
for (int i = 0; i < bLayNum; i++) {
wchar_t *ptszCurrLayout = GenerateLayoutString(hklLayouts[i]);
LPSTR ptszTemp = GetNameOfLayout(hklLayouts[i]);
- ptrW tszValue(g_plugin.getWStringA(ptszTemp));
- if (tszValue == 0)
- ptszLayStrings[i] = ptszCurrLayout;
- else if (!mir_wstrcmp(tszValue, ptszEmptySting))
+ ptrW tszValue(g_plugin.getWStringA(ptszTemp, ptszCurrLayout));
+ if (!mir_wstrlen(tszValue))
ptszLayStrings[i] = ptszCurrLayout;
else {
ptszLayStrings[i] = tszValue.detach();