summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-01-19 13:52:07 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:34:32 -0500
commitf129b0d7d5698e1220a13d895964fc7dd82691e4 (patch)
tree4e8658fdda4a0d57aff8e35541c6e463f4e6d837
parent62171ab39a83e015b9f0799fd45934a60e0edb54 (diff)
|= instead of = flag setting for want_focus during wayland surface commit
if want_focus has already been set, this check should not unset it
-rw-r--r--src/bin/e_comp_wl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 0d8eacf01..a7dc24deb 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1143,7 +1143,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
1143 if (ec->new_client) 1143 if (ec->new_client)
1144 { 1144 {
1145 ec->placed = placed; 1145 ec->placed = placed;
1146 ec->want_focus = ec->icccm.accepts_focus && (!ec->override); 1146 ec->want_focus |= ec->icccm.accepts_focus && (!ec->override);
1147 } 1147 }
1148 else if ((first) && (ec->placed) && (!ec->internal) && (!ec->override)) 1148 else if ((first) && (ec->placed) && (!ec->internal) && (!ec->override))
1149 { 1149 {