Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed macro playback junk char display issue on Find dialog

Browse Source 
Fix #5339, close #5340
This commit is contained in:
Rajendra Singh 2019-02-24 23:41:53 +05:30 committed by Don HO
parent 94c4608cc1
commit 21d73d44fe
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -2710,10 +2710,7 @@ void FindReplaceDlg::execSavedCommand(int cmd, uptr_t intValue, generic_string s
} }
else else
{ {
TCHAR moreInfo[128]; if (nbMarked == 1)
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string msg = pNativeSpeaker->getLocalizedStrFromID("find-status-invalid-re", TEXT("Find: Invalid regular expression"));
if (nbMarked <= 1)
{ {
result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-1-match", TEXT("1 match.")); result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-1-match", TEXT("1 match."));
} }
@ -2722,7 +2719,6 @@ void FindReplaceDlg::execSavedCommand(int cmd, uptr_t intValue, generic_string s
result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-nb-matches", TEXT("$INT_REPLACE$ matches.")); result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-nb-matches", TEXT("$INT_REPLACE$ matches."));
result = stringReplace(result, TEXT("$INT_REPLACE$"), std::to_wstring(nbMarked)); result = stringReplace(result, TEXT("$INT_REPLACE$"), std::to_wstring(nbMarked));
} }
result = moreInfo;
} }
setStatusbarMessage(result, FSMessage); setStatusbarMessage(result, FSMessage);
@ -2741,7 +2737,7 @@ void FindReplaceDlg::execSavedCommand(int cmd, uptr_t intValue, generic_string s
throw std::runtime_error("Internal error: unknown SnR command!"); throw std::runtime_error("Internal error: unknown SnR command!");
} }
} }
catch (std::runtime_error err) catch (const std::runtime_error& err)
{ {
MessageBoxA(NULL, err.what(), "Play Macro Exception", MB_OK); MessageBoxA(NULL, err.what(), "Play Macro Exception", MB_OK);
} }