From 2e3d9a0a4b61746cf112aeb76150c8aa4eb0b67d Mon Sep 17 00:00:00 2001 From: Thinkofname Date: Mon, 25 Apr 2016 13:45:13 +0100 Subject: [PATCH] Fix skins reverting to default on reload --- src/render/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/render/mod.rs b/src/render/mod.rs index 57a54cb..e823e27 100644 --- a/src/render/mod.rs +++ b/src/render/mod.rs @@ -540,7 +540,7 @@ impl Renderer { { let mut tex = self.textures.write().unwrap(); while let Ok((hash, img)) = self.skin_reply.try_recv() { - if let Some(img) = img { + if let Some(img) = img { tex.update_skin(hash, img); } } @@ -1000,7 +1000,8 @@ impl TextureManager { fn update_skin(&mut self, hash: String, img: image::DynamicImage) { if !self.skins.contains_key(&hash) { return; } - let tex = self.get_texture(&format!("steven-dynamic:skin-{}", hash)).unwrap(); + let name = format!("steven-dynamic:skin-{}", hash); + let tex = self.get_texture(&name).unwrap(); let rect = atlas::Rect { x: tex.x, y: tex.y, @@ -1009,6 +1010,7 @@ impl TextureManager { }; self.pending_uploads.push((tex.atlas, rect, img.to_rgba().into_vec())); + self.dynamic_textures.get_mut(&format!("skin-{}", hash)).unwrap().1 = img; } fn get_texture(&self, name: &str) -> Option {