@@ -139,38 +139,38 @@ impl CameraPreviewManager {
139139 // Called when the user deselects the camera. This is part of the persistent
140140 // renderer architecture that prevents crashes from repeated resource creation.
141141 pub fn pause ( & mut self ) {
142- if let Some ( preview) = & mut self . preview {
143- if !preview. is_paused {
144- preview . is_paused = true ;
145- preview
146- . reconfigure
147- . send ( ReconfigureEvent :: Pause )
148- . map_err ( |err| error ! ( "Error sending camera preview pause event: {err}" ) )
149- . ok ( ) ;
150- }
142+ if let Some ( preview) = & mut self . preview
143+ && !preview. is_paused
144+ {
145+ preview . is_paused = true ;
146+ preview
147+ . reconfigure
148+ . send ( ReconfigureEvent :: Pause )
149+ . map_err ( |err| error ! ( "Error sending camera preview pause event: {err}" ) )
150+ . ok ( ) ;
151151 }
152152 }
153153
154154 // Resumes a paused camera preview. Uses window.show() which is safe, unlike
155155 // panel.order_front_regardless() which causes crashes after repeated use.
156156 pub fn resume ( & mut self , window : & WebviewWindow ) {
157- if let Some ( preview) = & mut self . preview {
158- if preview. is_paused {
159- preview . is_paused = false ;
160- preview
161- . reconfigure
162- . send ( ReconfigureEvent :: Resume )
163- . map_err ( |err| error ! ( "Error sending camera preview resume event: {err}" ) )
164- . ok ( ) ;
165- window
166- . run_on_main_thread ( {
167- let window = window . clone ( ) ;
168- move || {
169- let _ = window . show ( ) ;
170- }
171- } )
172- . ok ( ) ;
173- }
157+ if let Some ( preview) = & mut self . preview
158+ && preview. is_paused
159+ {
160+ preview . is_paused = false ;
161+ preview
162+ . reconfigure
163+ . send ( ReconfigureEvent :: Resume )
164+ . map_err ( |err| error ! ( "Error sending camera preview resume event: {err}" ) )
165+ . ok ( ) ;
166+ window
167+ . run_on_main_thread ( {
168+ let window = window . clone ( ) ;
169+ move || {
170+ let _ = window . show ( ) ;
171+ }
172+ } )
173+ . ok ( ) ;
174174 }
175175 }
176176
@@ -182,14 +182,14 @@ impl CameraPreviewManager {
182182 & mut self ,
183183 expected_session_id : u64 ,
184184 ) -> Option < oneshot:: Receiver < ( ) > > {
185- if let Some ( preview) = & self . preview {
186- if preview. session_id != expected_session_id {
187- info ! (
188- "Skipping camera preview close: session mismatch (expected {}, current {})" ,
189- expected_session_id , preview . session_id
190- ) ;
191- return None ;
192- }
185+ if let Some ( preview) = & self . preview
186+ && preview. session_id != expected_session_id
187+ {
188+ info ! (
189+ "Skipping camera preview close: session mismatch (expected {}, current {})" ,
190+ expected_session_id , preview . session_id
191+ ) ;
192+ return None ;
193193 }
194194
195195 self . begin_shutdown ( )
@@ -854,10 +854,10 @@ impl Renderer {
854854 Err ( ReconfigureEvent :: Resume ) => {
855855 // On resume, we just need to present a frame to wake up the surface.
856856 // The actual window.show() happens in windows.rs ShowCapWindow::Camera.
857- if let Some ( surface) = & self . surface {
858- if let Ok ( texture) = surface. get_current_texture ( ) {
859- texture . present ( ) ;
860- }
857+ if let Some ( surface) = & self . surface
858+ && let Ok ( texture) = surface. get_current_texture ( )
859+ {
860+ texture . present ( ) ;
861861 }
862862 }
863863 Err ( ReconfigureEvent :: Shutdown ) => {
0 commit comments