mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for frame being NULL before setting/unsetting flags

Browse Source 
Fixes a crash in Firefox when clicking an "install plugin" popup.

Signed-off-by: Dima Ryazanov <dima@gmail.com>
This commit is contained in:
Dima Ryazanov
2013-11-15 02:01:19 -08:00
committed by Kristian Høgsberg
parent e5a3208373
commit b03b87fe63
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xwayland/window-manager.c
+4 -2
View File
@@ -695,12 +695,14 @@ weston_wm_window_activate(struct wl_listener *listener, void *data)
} }
if (wm->focus_window) { if (wm->focus_window) {
frame_unset_flag(wm->focus_window->frame, FRAME_FLAG_ACTIVE); if (wm->focus_window->frame)
frame_unset_flag(wm->focus_window->frame, FRAME_FLAG_ACTIVE);
weston_wm_window_schedule_repaint(wm->focus_window); weston_wm_window_schedule_repaint(wm->focus_window);
} }
wm->focus_window = window; wm->focus_window = window;
if (wm->focus_window) { if (wm->focus_window) {
frame_set_flag(wm->focus_window->frame, FRAME_FLAG_ACTIVE); if (wm->focus_window->frame)
frame_set_flag(wm->focus_window->frame, FRAME_FLAG_ACTIVE);
weston_wm_window_schedule_repaint(wm->focus_window); weston_wm_window_schedule_repaint(wm->focus_window);
} }
} }