Prechádzať zdrojové kódy

app: fix panic in video when exiting before video is loaded

darkfi 11 mesiacov pred
rodič
commit
6c2d3f63b9
1 zmenil súbory, kde vykonal 3 pridanie a 2 odobranie
  1. 3 2
      bin/app/src/ui/video.rs

+ 3 - 2
bin/app/src/ui/video.rs

@@ -183,8 +183,9 @@ impl Video {
                     // Make editing textures array and broadcasting an atomic op
                     // Make editing textures array and broadcasting an atomic op
                     {
                     {
                         let mut vid_data = vid_data.lock();
                         let mut vid_data = vid_data.lock();
-                        // FIXME panic here on unwrap None when closing app
-                        let mut vid_data = vid_data.as_mut().unwrap();
+                        // vid_data becomes None if the stop() is called. In which case
+                        // we just stop loading and return from this thread.
+                        let Some(mut vid_data) = vid_data.as_mut() else { return };
                         vid_data.textures[frame_idx] = Some(texture.clone());
                         vid_data.textures[frame_idx] = Some(texture.clone());
                         // broadcast
                         // broadcast
                         textures_pub.try_broadcast((frame_idx, texture)).unwrap();
                         textures_pub.try_broadcast((frame_idx, texture)).unwrap();