[haiku-commits] haiku: hrev45254 - src/servers/app
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 8 Feb 2013 03:15:20 +0100 (CET)
hrev45254 adds 1 changeset to branch 'master'
old head: fef7dd705f63febab7ab9514dcf1b1a1e7ddccdc
new head: 486aaa49f3cf67c1a1d10a199c2101b6069edc38
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=486aaa4+%5Efef7dd7
----------------------------------------------------------------------------
486aaa4: Check to make sure lastFocus is not NULL before using it.
This prevents an app_server crash on startup for me most likely
introduced in hrev45252. (Just a few commits ago)
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45254
Commit: 486aaa49f3cf67c1a1d10a199c2101b6069edc38
URL: http://cgit.haiku-os.org/haiku/commit/?id=486aaa4
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Feb 8 02:13:09 2013 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 1 deletion(-)
src/servers/app/Desktop.cpp | 4 +++-
----------------------------------------------------------------------------
diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 76c8084..4663c0b 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -1914,8 +1914,10 @@ Desktop::SetFocusWindow(Window* nextFocus)
// If the last window having focus is a window that
cannot make it
// to the front, we use that as the next focus
Window* lastFocus = fFocusList.LastWindow();
- if (!lastFocus->SupportsFront() &&
_WindowCanHaveFocus(lastFocus))
+ if (lastFocus != NULL && !lastFocus->SupportsFront()
+ && _WindowCanHaveFocus(lastFocus)) {
nextFocus = lastFocus;
+ }
}
}
Other related posts:
