Allow load addr to be manually passed

dfgordon · Sep 18, 2024 · c93a959 · c93a959
1 parent 3d5854e
commit c93a959
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/commands/put.rs b/src/commands/put.rs
@@ -30,15 +30,15 @@ fn pack_primitive(fimg: &mut FileImage, dat: &[u8], load_addr: Option<usize>, ty
                 _ => None,
             };
 
-            let load_addr = match parsed.get_entry(EntryType::ProdosFileInfo) {
+            let prodos_load_addr = match parsed.get_entry(EntryType::ProdosFileInfo) {
                 Some(EntryData::ProDOSFileInfo(file_info)) => Some(usize::try_from(file_info.aux_type).unwrap()),
                 _ => {
                     log::warn!("AppleSingle file does not contain any ProDOS file info");
                     None
                 },
             };
 
-            fimg.pack_bin(&data, load_addr, resource)
+            fimg.pack_bin(&data, load_addr.or(prodos_load_addr), resource)
         },
         ItemType::ApplesoftTokens => fimg.pack_tok(&dat,ItemType::ApplesoftTokens,None),
         ItemType::IntegerTokens => fimg.pack_tok(&dat,ItemType::IntegerTokens,None),