tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix corrupted encoding text on status bar 

Remove the shortcut text from the menu text that is used in status bar.

Fix #10146, close #10148
This commit is contained in:
mere-human 2021-07-13 22:02:23 +03:00 committed by Don Ho
parent 599f1852c7
commit 5e28b47ff8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PowerEditor/src/Notepad_plus.cpp
View File

@ -2620,15 +2620,19 @@ void Notepad_plus::setUniModeText()
int cmdID = em.getIndexFromEncoding(encoding); int cmdID = em.getIndexFromEncoding(encoding);
if (cmdID == -1) if (cmdID == -1)
{ {
//printStr(TEXT("Encoding problem. Encoding is not added in encoding_table?")); assert(!"Encoding problem. Encoding is not added in encoding_table?");
return; return;
} }
cmdID += IDM_FORMAT_ENCODE; cmdID += IDM_FORMAT_ENCODE;
const int itemSize = 64; const int itemSize = 64;
TCHAR uniModeText[itemSize]; TCHAR uniModeText[itemSize] = {};
::GetMenuString(_mainMenuHandle, cmdID, uniModeText, itemSize, MF_BYCOMMAND); ::GetMenuString(_mainMenuHandle, cmdID, uniModeText, itemSize, MF_BYCOMMAND);
uniModeTextString = uniModeText; uniModeTextString = uniModeText;
// Remove the shortcut text from the menu text.
const size_t tabPos = uniModeTextString.find_last_of('\t');
if (tabPos != generic_string::npos)
uniModeTextString.resize(tabPos);
} }
_statusBar.setText(uniModeTextString.c_str(), STATUSBAR_UNICODE_TYPE); _statusBar.setText(uniModeTextString.c_str(), STATUSBAR_UNICODE_TYPE);
} }