[BUG_FIXED] (Author: Pekka Pöyry) Fix the issue of document focus after canceling exit on an unsaved file.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1003 f5eea248-9336-0410-98b8-ebc06183d4e3
remotes/trunk
Don Ho 2013-01-08 01:00:19 +00:00
parent 6c344ac24c
commit 18737c7ccd
1 changed files with 11 additions and 9 deletions

View File

@ -576,8 +576,9 @@ bool Notepad_plus::fileCloseAll()
}
else if (buf->isDirty())
{
_mainDocTab.activateBuffer(id);
_mainEditView.activateBuffer(id);
activateBuffer(id, MAIN_VIEW);
if(!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW);
int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES)
@ -601,8 +602,8 @@ bool Notepad_plus::fileCloseAll()
}
else if (buf->isDirty())
{
_subDocTab.activateBuffer(id);
_subEditView.activateBuffer(id);
activateBuffer(id, SUB_VIEW);
switchEditViewTo(SUB_VIEW);
int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES)
@ -654,8 +655,9 @@ bool Notepad_plus::fileCloseAllButCurrent()
}
else if (buf->isDirty())
{
_mainDocTab.activateBuffer(id);
_mainEditView.activateBuffer(id);
activateBuffer(id, MAIN_VIEW);
if(!activateBuffer(id, SUB_VIEW))
switchEditViewTo(MAIN_VIEW);
int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES)
@ -681,8 +683,8 @@ bool Notepad_plus::fileCloseAllButCurrent()
}
else if (buf->isDirty())
{
_subDocTab.activateBuffer(id);
_subEditView.activateBuffer(id);
activateBuffer(id, SUB_VIEW);
switchEditViewTo(SUB_VIEW);
int res = doSaveOrNot(buf->getFullPathName());
if (res == IDYES)