forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deadlock in hot asset reloading (#375) (#376)

Browse Source
This commit is contained in:
Mariusz Kryński 2020-08-30 02:16:46 +02:00 committed by GitHub
parent 00be5d083e
commit 8101622f37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/bevy_asset/src/asset_server.rs
View File

@ -187,16 +187,20 @@ impl AssetServer {
use notify::event::{Event, EventKind, ModifyKind}; use notify::event::{Event, EventKind, ModifyKind};
let mut changed = HashSet::default(); let mut changed = HashSet::default();
while let Some(filesystem_watcher) = asset_server.filesystem_watcher.read().as_ref() { loop {
let result = match filesystem_watcher.receiver.try_recv() { let result = {
Ok(result) => result, let rwlock_guard = asset_server.filesystem_watcher.read();
Err(TryRecvError::Empty) => { if let Some(filesystem_watcher) = rwlock_guard.as_ref() {
filesystem_watcher.receiver.try_recv()
} else {
break; break;
} }
};
let event = match result {
Ok(result) => result.unwrap(),
Err(TryRecvError::Empty) => break,
Err(TryRecvError::Disconnected) => panic!("FilesystemWatcher disconnected"), Err(TryRecvError::Disconnected) => panic!("FilesystemWatcher disconnected"),
}; };
let event = result.unwrap();
if let Event { if let Event {
kind: EventKind::Modify(ModifyKind::Data(_)), kind: EventKind::Modify(ModifyKind::Data(_)),
paths, paths,