[BUG_FIXED] (Author: Andreas Jonsson) Fix "Find all in current document" asking for creating a new file bug (regression).

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1068 f5eea248-9336-0410-98b8-ebc06183d4e3
remotes/trunk
Don Ho 12 years ago
parent 6902738c86
commit 7898a2ff44

@ -893,21 +893,19 @@ bool FileManager::loadFileData(Document doc, const TCHAR * filename, Utf8_16_Rea
return success; return success;
} }
/* BufferID FileManager::getBufferFromName(const TCHAR * name)
BufferID FileManager::getBufferFromName(const TCHAR * name) { {
// Attempt to match by name first.
TCHAR fullpath[MAX_PATH]; TCHAR fullpath[MAX_PATH];
::GetFullPathName(name, MAX_PATH, fullpath, NULL); ::GetFullPathName(name, MAX_PATH, fullpath, NULL);
::GetLongPathName(fullpath, fullpath, MAX_PATH); ::GetLongPathName(fullpath, fullpath, MAX_PATH);
for(size_t i = 0; i < _buffers.size(); i++) { for(size_t i = 0; i < _buffers.size(); i++)
{
if (!lstrcmpi(name, _buffers.at(i)->getFullPathName())) if (!lstrcmpi(name, _buffers.at(i)->getFullPathName()))
return _buffers.at(i)->getID(); return _buffers.at(i)->getID();
} }
return BUFFER_INVALID;
}
*/
BufferID FileManager::getBufferFromName(const TCHAR * name) // If no buffer matches exactly by name, try another method.
{
HANDLE givenFile = ::CreateFile(name, HANDLE givenFile = ::CreateFile(name,
GENERIC_READ, GENERIC_READ,
FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,

Loading…
Cancel
Save