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

Fix activating wrong file(s) issue after loading session file 

... if some files are already opened in Notepad++.

Fix #14006, close #14028
pull/14035/head
Don Ho 2023-08-19 18:05:15 +02:00
parent ea40755e14
commit fc736d8afb
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PowerEditor/src/NppIO.cpp
View File

@ -2353,11 +2353,21 @@ bool Notepad_plus::loadSession(Session & session, bool isSnapshotMode, bool shou
_mainEditView.restoreCurrentPosPreStep();
_subEditView.restoreCurrentPosPreStep();
if (session._activeMainIndex < _mainDocTab.nbItem())//session.nbMainFiles())
activateBuffer(_mainDocTab.getBufferByIndex(session._activeMainIndex), MAIN_VIEW);
if (session._activeMainIndex < session._mainViewFiles.size())
{
const wchar_t* fileName = session._mainViewFiles[session._activeMainIndex]._fileName.c_str();
BufferID buf = _mainDocTab.findBufferByName(fileName);
if (buf != BUFFER_INVALID)
activateBuffer(buf, MAIN_VIEW);
}
if (session._activeSubIndex < _subDocTab.nbItem())//session.nbSubFiles())
activateBuffer(_subDocTab.getBufferByIndex(session._activeSubIndex), SUB_VIEW);
if (session._activeSubIndex < session._subViewFiles.size())
{
const wchar_t* fileName = session._subViewFiles[session._activeSubIndex]._fileName.c_str();
BufferID buf = _subDocTab.findBufferByName(fileName);
if (buf != BUFFER_INVALID)
activateBuffer(buf, SUB_VIEW);
}
if ((session.nbSubFiles() > 0) && (session._activeView == MAIN_VIEW || session._activeView == SUB_VIEW))
switchEditViewTo(static_cast<int32_t>(session._activeView));