@@ -147,11 +147,11 @@ impl Dispatch<ZriverOutputStatusV1, ObjectId> for State {
147147 }
148148 } ,
149149 UrgentTags { tags } => {
150- if tags != 0 {
151- if let Some ( output) = state. get_output ( data) {
152- output . urgent_tags = Some ( tags ) ;
153- state . updated = true ;
154- }
150+ if tags != 0
151+ && let Some ( output) = state. get_output ( data)
152+ {
153+ output . urgent_tags = Some ( tags ) ;
154+ state . updated = true ;
155155 }
156156 } ,
157157 ViewTags { tags } => {
@@ -187,14 +187,14 @@ impl Dispatch<wl_output::WlOutput, ()> for State {
187187 _: & Connection ,
188188 qhandle : & QueueHandle < Self > ,
189189 ) {
190- if let wl_output:: Event :: Name { name } = event {
191- if CONFIG . output . as_ref ( ) . is_none_or ( |output| output. eq ( & name) ) {
192- let mut output = Output :: new ( name, proxy. to_owned ( ) ) ;
193- if let Some ( status_mgr) = & state. status_manager {
194- output. status = Some ( status_mgr. get_river_output_status ( proxy, qhandle, proxy. id ( ) ) ) ;
195- }
196- state. outputs . push ( output) ;
190+ if let wl_output:: Event :: Name { name } = event
191+ && CONFIG . output . as_ref ( ) . is_none_or ( |output| output. eq ( & name) )
192+ {
193+ let mut output = Output :: new ( name, proxy. to_owned ( ) ) ;
194+ if let Some ( status_mgr) = & state. status_manager {
195+ output. status = Some ( status_mgr. get_river_output_status ( proxy, qhandle, proxy. id ( ) ) ) ;
197196 }
197+ state. outputs . push ( output) ;
198198 }
199199 }
200200}
@@ -220,14 +220,14 @@ impl Dispatch<wl_seat::WlSeat, ()> for State {
220220 _: & Connection ,
221221 qhandle : & QueueHandle < Self > ,
222222 ) {
223- if let wl_seat:: Event :: Name { name } = event {
224- if CONFIG . seat . as_ref ( ) . is_none_or ( |seat| seat. eq ( & name) ) {
225- let mut seat = Seat :: new ( name, proxy. to_owned ( ) ) ;
226- if let Some ( status_mgr) = & state. status_manager {
227- seat. status = Some ( status_mgr. get_river_seat_status ( proxy, qhandle, ( ) ) ) ;
228- }
229- state. seat = Some ( seat) ;
223+ if let wl_seat:: Event :: Name { name } = event
224+ && CONFIG . seat . as_ref ( ) . is_none_or ( |seat| seat. eq ( & name) )
225+ {
226+ let mut seat = Seat :: new ( name, proxy. to_owned ( ) ) ;
227+ if let Some ( status_mgr) = & state. status_manager {
228+ seat. status = Some ( status_mgr. get_river_seat_status ( proxy, qhandle, ( ) ) ) ;
230229 }
230+ state. seat = Some ( seat) ;
231231 }
232232 }
233233}
0 commit comments