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 unsaved untitled files not being opened on the next session regression 

Fix #11080
This commit is contained in:
Don Ho 2022-01-26 17:49:37 +01:00
parent 961a133a60
commit 2132505cba
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/ScintillaComponent/Buffer.cpp
View File

@ -640,12 +640,16 @@ void FileManager::closeBuffer(BufferID id, ScintillaEditView * identifier)
// backupFileName is sentinel of backup mode: if it's not NULL, then we use it (load it). Otherwise we use filename // backupFileName is sentinel of backup mode: if it's not NULL, then we use it (load it). Otherwise we use filename
BufferID FileManager::loadFile(const TCHAR * filename, Document doc, int encoding, const TCHAR *backupFileName, FILETIME fileNameTimestamp) BufferID FileManager::loadFile(const TCHAR* filename, Document doc, int encoding, const TCHAR* backupFileName, FILETIME fileNameTimestamp)
{ {
//Get file size //Get file size
FILE* fp = generic_fopen(filename, TEXT("rb")); const TCHAR* pPath = filename;
if (!::PathFileExists(pPath))
pPath = backupFileName;
FILE* fp = generic_fopen(pPath, TEXT("rb"));
if (!fp) if (!fp)
return BUFFER_INVALID; return BUFFER_INVALID;
_fseeki64(fp, 0, SEEK_END); _fseeki64(fp, 0, SEEK_END);
int64_t fileSize = _ftelli64(fp); int64_t fileSize = _ftelli64(fp);
fclose(fp); fclose(fp);