Skip to content

Commit

Permalink
Try #2395:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] authored Jun 25, 2021
2 parents 3a1867a + 5fb5a69 commit 77443ee
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions crates/bevy_asset/src/asset_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,13 @@ impl AssetServer {
&self,
extension: &str,
) -> Result<Arc<Box<dyn AssetLoader>>, AssetServerError> {
self.server
.extension_to_loader_index
.read()
.get(extension)
.map(|index| self.server.loaders.read()[*index].clone())
let index = {
// scope map to drop lock as soon as possible
let map = self.server.extension_to_loader_index.read();
map.get(extension).copied()
};
index
.map(|index| self.server.loaders.read()[index].clone())
.ok_or_else(|| AssetServerError::MissingAssetLoader {
extensions: vec![extension.to_string()],
})
Expand Down

0 comments on commit 77443ee

Please sign in to comment.