From ac761813a1ae843562389db7584cab2680e02bbe Mon Sep 17 00:00:00 2001 From: Benjamin Klum Date: Mon, 4 Jul 2022 12:55:02 +0200 Subject: [PATCH] #394 Load default value even if snapshot doesn't exist --- Cargo.lock | 2 +- main/Cargo.toml | 2 +- main/src/domain/targets/load_mapping_snapshot_target.rs | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f5acbbd71..15a6f4859 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "realearn" -version = "2.13.0-pre.11" +version = "2.13.0-pre.12" dependencies = [ "approx", "arboard", diff --git a/main/Cargo.toml b/main/Cargo.toml index b57d229a9..3d3500189 100644 --- a/main/Cargo.toml +++ b/main/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "realearn" -version = "2.13.0-pre.11" +version = "2.13.0-pre.12" authors = ["Benjamin Klum "] edition = "2021" build = "build.rs" diff --git a/main/src/domain/targets/load_mapping_snapshot_target.rs b/main/src/domain/targets/load_mapping_snapshot_target.rs index b6c5ea50c..5e650b25d 100644 --- a/main/src/domain/targets/load_mapping_snapshot_target.rs +++ b/main/src/domain/targets/load_mapping_snapshot_target.rs @@ -215,12 +215,9 @@ impl HitInstruction for LoadMappingSnapshotInstruction { VirtualMappingSnapshot::ById(id) => { let instance_state = context.control_context.instance_state.borrow(); let snapshot_container = instance_state.mapping_snapshot_container(); - let snapshot = match snapshot_container.find_snapshot_by_id(id) { - None => return vec![], - Some(s) => s, - }; + let snapshot = snapshot_container.find_snapshot_by_id(id); self.load_snapshot(context, |m| { - snapshot.find_target_value_by_mapping_id(m.id()) + snapshot.and_then(|s| s.find_target_value_by_mapping_id(m.id())) }) } }