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

Fix a regression: double-clicking on a "find all in current document" result for an unsaved doc prompts to save it

Browse Source
This commit is contained in:
Don HO 2019-03-09 15:59:16 +01:00
parent faa2fb4e8a
commit 6580255a2b
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PowerEditor/src/NppIO.cpp
View File

@ -157,7 +157,25 @@ BufferID Notepad_plus::doOpen(const generic_string& fileName, bool isRecursive,
} }
_lastRecentFileList.remove(longFileName); _lastRecentFileList.remove(longFileName);
BufferID test = MainFileManager->getBufferFromName(longFileName); generic_string fileName2Find;
generic_string gs_fileName{ fileName };
// The following code is useful while running commands "Find in current doc" & "Find in opened docs" and
// if the occurrence is found in untitled documents and user double-clicks the found entries of untitled documents.
// "fileName" is "new N"
size_t res = gs_fileName.find_first_of(UNTITLED_STR);
if (res != string::npos && res == 0)
{
fileName2Find = fileName;
}
else
{
fileName2Find = longFileName;
}
// If we found the document with fileName2Find, then we don't open the existing doc.
// we return the found buffer ID instead.
BufferID test = MainFileManager->getBufferFromName(fileName2Find.c_str());
if (test != BUFFER_INVALID && !isSnapshotMode) if (test != BUFFER_INVALID && !isSnapshotMode)
{ {
if (_pTrayIco) if (_pTrayIco)