Merge pull request #687 from kkolyan/path_crash

fix crash on MacOS in `notify` crate when path is set first time with "Default::default"
FyroxEngine · Oct 13, 2024 · f0c6568 · f0c6568
2 parents 8e3445c + 9d567af
commit f0c6568
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/editor/src/asset/mod.rs b/editor/src/asset/mod.rs
@@ -885,8 +885,15 @@ impl AssetBrowser {
         message_sender: &MessageSender,
     ) {
         if let Some(watcher) = self.watcher.as_mut() {
-            Log::verify(watcher.unwatch(&self.selected_path));
-            Log::verify(watcher.watch(path, RecursiveMode::NonRecursive));
+            // notify 6.1.1 crashes otherwise
+            if self.selected_path.exists() {
+                Log::verify(watcher.unwatch(&self.selected_path));
+            }
+            if path.exists() {
+                Log::verify(watcher.watch(path, RecursiveMode::NonRecursive));
+            } else {
+                Log::err(format!("cannot watch non-existing path {:?}", path));
+            }
         }
 
         self.selected_path = path.to_path_buf();