diff --git a/src/components/main/pipeline.rs b/src/components/main/pipeline.rs index 2ed978360ac..78ebd91c868 100644 --- a/src/components/main/pipeline.rs +++ b/src/components/main/pipeline.rs @@ -202,7 +202,8 @@ impl Pipeline { } pub fn reload(&self) { - self.url.borrow().clone().map(|url| { + let url = self.url.borrow().clone(); + url.map(|url| { self.load(url); }); } diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index f8e7d230420..1390071435e 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -810,19 +810,16 @@ impl ScriptTask { is a bug."); let page = page_tree.page(); - { - let mut page_url = page.mut_url(); - let last_loaded_url = replace(&mut *page_url, None); - for loaded in last_loaded_url.iter() { - let (ref loaded, needs_reflow) = *loaded; - if *loaded == url { - *page_url = Some((loaded.clone(), false)); - if needs_reflow { - page.damage(ContentChangedDocumentDamage); - page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor); - } - return; + let last_loaded_url = replace(&mut *page.mut_url(), None); + for loaded in last_loaded_url.iter() { + let (ref loaded, needs_reflow) = *loaded; + if *loaded == url { + *page.mut_url() = Some((loaded.clone(), false)); + if needs_reflow { + page.damage(ContentChangedDocumentDamage); + page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor); } + return; } }