[PATCH xwayland 2/3] Check for frame being NULL before setting/unsetting flags
Dima Ryazanov
dima at gmail.com
Fri Nov 15 02:01:19 PST 2013
Fixes a crash in Firefox when clicking an "install plugin" popup.
Signed-off-by: Dima Ryazanov <dima at gmail.com>
---
src/xwayland/window-manager.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index 5ee9480..6d29026 100644
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -695,12 +695,14 @@ weston_wm_window_activate(struct wl_listener *listener, void *data)
}
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);
}
wm->focus_window = 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);
}
}
--
1.8.3.2
More information about the wayland-devel
mailing list