mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-07-24 16:13:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent subsequent panics for already borrowed editor (#689)

Browse source 
Fix double panic
This commit is contained in:
0HyperCube 2022-06-26 22:55:24 +01:00 • committed by Keavon Chambers
parent 91219cbe64
commit 581ed81747
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
frontend/wasm/src/editor_api.rs
View file

@ -65,16 +65,21 @@ impl JsEditorHandle {
}
let frontend_messages = EDITOR_INSTANCES.with(|instances| {
instances
.borrow_mut()
.get_mut(&self.editor_id)
.expect("EDITOR_INSTANCES does not contain the current editor_id")
.handle_message(message.into())
instances.try_borrow_mut().map(|mut editors| {
editors
.get_mut(&self.editor_id)
.expect("EDITOR_INSTANCES does not contain the current editor_id")
.handle_message(message.into())
})
});
for message in frontend_messages.into_iter() {
// Send each FrontendMessage to the JavaScript frontend
self.send_frontend_message_to_js(message);
if let Ok(frontend_messages) = frontend_messages {
for message in frontend_messages.into_iter() {
// Send each FrontendMessage to the JavaScript frontend
self.send_frontend_message_to_js(message);
}
}
// If the editor cannot be borrowed then it has encountered a panic - we should just ignore new dispatches
}
// Sends a FrontendMessage to JavaScript