i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check to make sure lastFocus is not NULL before using it.

Browse Source 
This prevents an app_server crash on startup for me most likely
introduced in hrev45252. (Just a few commits ago)
This commit is contained in:
John Scipione
2013-02-07 21:13:09 -05:00
parent fef7dd705f
commit 486aaa49f3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Desktop.cpp
+3 -1
View File
@@ -1914,8 +1914,10 @@ Desktop::SetFocusWindow(Window* nextFocus)
// If the last window having focus is a window that cannot make it // If the last window having focus is a window that cannot make it
// to the front, we use that as the next focus // to the front, we use that as the next focus
Window* lastFocus = fFocusList.LastWindow(); Window* lastFocus = fFocusList.LastWindow();
if (!lastFocus->SupportsFront() && _WindowCanHaveFocus(lastFocus)) if (lastFocus != NULL && !lastFocus->SupportsFront()
&& _WindowCanHaveFocus(lastFocus)) {
nextFocus = lastFocus; nextFocus = lastFocus;
}
} }
} }