Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/elfmz/far2l.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShmuel Zeigerman <solomuz0@gmail.com>2022-03-19 21:36:28 +0300
committerShmuel Zeigerman <solomuz0@gmail.com>2022-03-19 21:36:28 +0300
commitf49e2475f7eba50d3d5c10487b26d9b392b9e470 (patch)
tree0d55270053393807d4286ec8cb08a2a388a961ae /far2l/src/plug
parent96a6df49ded7e445fe6864919a2f87990189c2e3 (diff)
Fix assigning hotkeys to plugins and config menus
Diffstat (limited to 'far2l/src/plug')
-rw-r--r--far2l/src/plug/plugins.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/far2l/src/plug/plugins.cpp b/far2l/src/plug/plugins.cpp
index 77b96157..4a507ff3 100644
--- a/far2l/src/plug/plugins.cpp
+++ b/far2l/src/plug/plugins.cpp
@@ -1278,7 +1278,7 @@ void PluginManager::Configure(int StartPos)
if (!HotKeysPresent)
ListItem.strName = strName;
else if (!strHotKey.IsEmpty())
- ListItem.strName.Format(L"&%c%ls %ls",strHotKey.At(0),(strHotKey.At(0)==L'&'?L"&":L""), strName.CPtr());
+ ListItem.strName.Format(L"&%lc%ls %ls",strHotKey.At(0),(strHotKey.At(0)==L'&'?L"&":L""), strName.CPtr());
else
ListItem.strName.Format(L" %ls", strName.CPtr());
@@ -1451,7 +1451,7 @@ int PluginManager::CommandsMenu(int ModalType,int StartPos,const wchar_t *Histor
if (!HotKeysPresent)
ListItem.strName = strName;
else if (!strHotKey.IsEmpty())
- ListItem.strName.Format(L"&%c%ls %ls",strHotKey.At(0),(strHotKey.At(0)==L'&'?L"&":L""), strName.CPtr());
+ ListItem.strName.Format(L"&%lc%ls %ls",strHotKey.At(0),(strHotKey.At(0)==L'&'?L"&":L""), strName.CPtr());
else
ListItem.strName.Format(L" %ls", strName.CPtr());
@@ -1622,7 +1622,7 @@ bool PluginManager::SetHotKeyDialog(
)
{
KeyFileHelper kfh(PluginsIni());
- const auto &Setting = kfh.GetString(SettingsSection, SettingName);
+ const auto &Setting = kfh.GetString(SettingsSection, SettingName, L"");
WCHAR Letter[2] = {Setting.empty() ? 0 : Setting[0], 0};
if (!HotkeyLetterDialog(Msg::PluginHotKeyTitle, DlgPluginTitle, Letter[0]))
return false;