From 5571289aca8b5bef6709518e2883e203e7a6e6ab Mon Sep 17 00:00:00 2001 From: TheRawMeatball Date: Sat, 23 Jan 2021 00:03:46 +0300 Subject: [PATCH 1/4] Implement fix --- crates/bevy_asset/src/asset_server.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index fafff56008346..ac11ddbbcac60 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -298,7 +298,13 @@ impl AssetServer { server.load_async(owned_path, force).await.unwrap(); }) .detach(); - asset_path.into() + let owned_path = asset_path.to_owned(); + let id: HandleId = asset_path.into(); + self.server + .handle_to_path + .write() + .insert(id.clone(), owned_path); + id } pub fn load_folder>( From 5512371b1f1ae731de10d6f2479fa5d967cceed6 Mon Sep 17 00:00:00 2001 From: TheRawMeatball Date: Sat, 23 Jan 2021 13:38:51 +0300 Subject: [PATCH 2/4] cargo clippy --- crates/bevy_asset/src/asset_server.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index ac11ddbbcac60..ead7f87852463 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -303,7 +303,7 @@ impl AssetServer { self.server .handle_to_path .write() - .insert(id.clone(), owned_path); + .insert(id, owned_path); id } From 95383ac03a9ca00e902932cf5875333aabe6ad85 Mon Sep 17 00:00:00 2001 From: TheRawMeatball Date: Sat, 23 Jan 2021 13:53:21 +0300 Subject: [PATCH 3/4] cargo fmt --- crates/bevy_asset/src/asset_server.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index ead7f87852463..e7a67f8f63634 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -300,10 +300,7 @@ impl AssetServer { .detach(); let owned_path = asset_path.to_owned(); let id: HandleId = asset_path.into(); - self.server - .handle_to_path - .write() - .insert(id, owned_path); + self.server.handle_to_path.write().insert(id, owned_path); id } From 286b5f7098fb28b2eaa6b74c0aba534a726cfba0 Mon Sep 17 00:00:00 2001 From: TheRawMeatball Date: Sat, 23 Jan 2021 00:03:46 +0300 Subject: [PATCH 4/4] Implement fix --- crates/bevy_asset/src/asset_server.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index f96a624ef5d91..1072b030e20f2 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -311,7 +311,10 @@ impl AssetServer { } }) .detach(); - asset_path.into() + let owned_path = asset_path.to_owned(); + let id: HandleId = asset_path.into(); + self.server.handle_to_path.write().insert(id, owned_path); + id } pub fn load_folder>(