Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix FFM focus loss on window close

Browse Source 
kFocusList is an invalid index for _Windows(). fWorkspaces would be
accessed out of bounds.
This commit is contained in:
Ingo Weinhold 2013-05-11 07:29:34 +02:00
parent ee7f4fab92
commit 9e1a0720cb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/servers/app/Desktop.cpp
View File

@ -1903,12 +1903,15 @@ Desktop::SetFocusWindow(Window* nextFocus)
return;
}
uint32 list = fCurrentWorkspace;
if (!fSettings->NormalMouse())
list = kFocusList;
uint32 listIndex = fCurrentWorkspace;
WindowList* list = &_Windows(fCurrentWorkspace);
if (!fSettings->NormalMouse()) {
listIndex = kFocusList;
list = &fFocusList;
}
if (nextFocus == NULL || hasModal || hasWindowScreen) {
nextFocus = _Windows(list).LastWindow();
nextFocus = list->LastWindow();
if (fSettings->NormalMouse()) {
// If the last window having focus is a window that cannot make it
@ -1923,7 +1926,7 @@ Desktop::SetFocusWindow(Window* nextFocus)
// make sure no window is chosen that doesn't want focus or cannot have it
while (nextFocus != NULL && !_WindowCanHaveFocus(nextFocus)) {
nextFocus = nextFocus->PreviousWindow(list);
nextFocus = nextFocus->PreviousWindow(listIndex);
}
if (fFocus == nextFocus) {