Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Commands: a frontend-only command's own failure is its result (#696)

tylerjenningsw73ea42701533
diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index e19e0c6d8..ae0834ca2 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -752,7 +752,7 @@ fn clipboard_note(s: &effectcraft_engine::Session) -> String {
}
pub(crate) fn run_engine(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, params: Value) -> Result<Value, String> {
- let r = app.session.execute(id, params).map_err(|e| e.to_string());
+ let mut r = app.session.execute(id, params).map_err(|e| e.to_string());
if let Err(e) = &r {
app.ui.status = e.clone();
} else if COPY_COMMANDS.contains(&id) && app.session.state.text_edit.is_none() {
@@ -763,7 +763,12 @@ pub(crate) fn run_engine(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str
match ev {
effectcraft_engine::Event::Frontend { command, params } => {
if let Err(e) = frontend(app, ctx, &command, params) {
- app.ui.status = e;
+ app.ui.status = e.clone();
+ // A frontend-only command's own failure is the command's result (#696: a
+ // workspace save that didn't reach disk reported success).
+ if command == id && r.is_ok() {
+ r = Err(e);
+ }
}
}
other => app.session.events.push(other),