#394 Load default value even if snapshot doesn't exist

helgoboss · Jul 4, 2022 · ac76181 · ac76181
1 parent c4f4f4b
commit ac76181
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 <[email protected]>"]
 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
@@ -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()))
                 })
             }
         }